diff options
| author | Remco Burema <r.burema@ultimaker.com> | 2019-02-05 15:24:28 +0300 |
|---|---|---|
| committer | Remco Burema <r.burema@ultimaker.com> | 2019-02-05 15:24:28 +0300 |
| commit | 5c54cb740aec8038652b7fc8aaca3b3788874048 (patch) | |
| tree | 1ccfd91ecd0e1cae58c2f21e33f25e511ed2d162 /resources/qml/ActionPanel | |
| parent | cfdadbaffb65fea9c98d82e5004e4c980f4014c1 (diff) | |
Fix dark-theme material-estimates-panel (and layout-issues). [CURA-6174]
Diffstat (limited to 'resources/qml/ActionPanel')
| -rw-r--r-- | resources/qml/ActionPanel/PrintJobInformation.qml | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/resources/qml/ActionPanel/PrintJobInformation.qml b/resources/qml/ActionPanel/PrintJobInformation.qml index 7cd466c33f..4b8461987b 100644 --- a/resources/qml/ActionPanel/PrintJobInformation.qml +++ b/resources/qml/ActionPanel/PrintJobInformation.qml @@ -39,8 +39,8 @@ Column id: byLineType property var printDuration: PrintInformation.currentPrintTime - property var columnWidthMultipliers: [ 0.4, 0.3, 0.3 ] - property var columnHorizontalAligns: [ TextInput.AlignLeft, TextInput.AlignHCenter, TextInput.AlignHCenter ] + property var columnWidthMultipliers: [ 0.45, 0.3, 0.25 ] + property var columnHorizontalAligns: [ Text.AlignLeft, Text.AlignHCenter, Text.AlignRight ] function getMaterialTable() { @@ -81,6 +81,7 @@ Column width: Math.round(byLineType.width * byLineType.columnWidthMultipliers[index]) height: contentHeight horizontalAlignment: byLineType.columnHorizontalAligns[index] + color: UM.Theme.getColor("text") font: UM.Theme.getFont("default") wrapMode: Text.WrapAnywhere text: modelData @@ -124,8 +125,8 @@ Column property var printMaterialWeights: PrintInformation.materialWeights property var printMaterialCosts: PrintInformation.materialCosts property var printMaterialNames: PrintInformation.materialNames - property var columnWidthMultipliers: [ 0.4, 0.2, 0.2, 0.2 ] - property var columnHorizontalAligns: [ TextInput.AlignLeft, TextInput.AlignHCenter, TextInput.AlignHCenter, TextInput.AlignHCenter ] + property var columnWidthMultipliers: [ 0.46, 0.18, 0.18, 0.18 ] + property var columnHorizontalAligns: [ Text.AlignLeft, Text.AlignHCenter, Text.AlignHCenter, Text.AlignRight ] function getMaterialTable() { @@ -183,7 +184,8 @@ Column { width: Math.round(byMaterialType.width * byMaterialType.columnWidthMultipliers[index]) height: contentHeight - horizontalAlignment: byLineType.columnHorizontalAligns[index] + horizontalAlignment: byMaterialType.columnHorizontalAligns[index] + color: UM.Theme.getColor("text") font: UM.Theme.getFont("default") wrapMode: Text.WrapAnywhere text: modelData |