GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 16:59:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move TabRow below so it renders over the top lining of content rectangles.

Browse Source 
Update Tab styles to match designs

CURA-8979
This commit is contained in:
j.delarago 2022-03-15 16:19:33 +01:00
parent b33a5d7b84
commit 9dbc497fcb
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
resources/qml/Preferences/Materials/MaterialsView.qml
View File

@ -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 Rectangle
{ {
color: UM.Theme.getColor("main_background") color: UM.Theme.getColor("main_background")
@ -94,7 +79,7 @@ Item
bottom: parent.bottom bottom: parent.bottom
} }
border.width: UM.Theme.getSize("default_lining").width border.width: UM.Theme.getSize("default_lining").width
border.color: UM.Theme.getColor("thick_lining") border.color: UM.Theme.getColor("border_main")
ScrollView 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() function updateCostPerMeter()
{ {
base.spoolLength = calculateSpoolLength(diameterSpinBox.value, densitySpinBox.value, spoolWeightSpinBox.value); base.spoolLength = calculateSpoolLength(diameterSpinBox.value, densitySpinBox.value, spoolWeightSpinBox.value);