diff options
author | j.delarago <joeydelarago@gmail.com> | 2022-03-15 18:19:33 +0300 |
---|---|---|
committer | j.delarago <joeydelarago@gmail.com> | 2022-03-15 18:19:33 +0300 |
commit | 9dbc497fcbe68ab78ceef6023398fbbadf2baf34 (patch) | |
tree | fa4ecfff4d51647156ef968c34615d784c5fbd6a | |
parent | b33a5d7b8464a6a033e6a2894f156dba21371c2c (diff) |
Move TabRow below so it renders over the top lining of content rectangles.
Update Tab styles to match designs
CURA-8979
-rw-r--r-- | resources/qml/Preferences/Materials/MaterialsView.qml | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/resources/qml/Preferences/Materials/MaterialsView.qml b/resources/qml/Preferences/Materials/MaterialsView.qml index a579a36a8d..c1f8e93bc1 100644 --- a/resources/qml/Preferences/Materials/MaterialsView.qml +++ b/resources/qml/Preferences/Materials/MaterialsView.qml @@ -66,21 +66,6 @@ Item } } - UM.TabRow - { - id: pageSelectorTabRow - UM.TabRowButton - { - text: catalog.i18nc("@title", "Information") - property string activeView: "information" //To determine which page gets displayed. - } - UM.TabRowButton - { - text: catalog.i18nc("@label", "Print settings") - property string activeView: "settings" - } - } - Rectangle { color: UM.Theme.getColor("main_background") @@ -94,7 +79,7 @@ Item bottom: parent.bottom } border.width: UM.Theme.getSize("default_lining").width - border.color: UM.Theme.getColor("thick_lining") + border.color: UM.Theme.getColor("border_main") ScrollView { @@ -607,6 +592,21 @@ Item } } + UM.TabRow + { + id: pageSelectorTabRow + UM.TabRowButton + { + text: catalog.i18nc("@title", "Information") + property string activeView: "information" //To determine which page gets displayed. + } + UM.TabRowButton + { + text: catalog.i18nc("@label", "Print settings") + property string activeView: "settings" + } + } + function updateCostPerMeter() { base.spoolLength = calculateSpoolLength(diameterSpinBox.value, densitySpinBox.value, spoolWeightSpinBox.value); |