3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-06 05:23:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Simplify the SettingCategory

Browse source
This commit is contained in:
Jaime van Kessel 2020-07-10 14:50:44 +02:00
parent e633b6408e
commit 8b7b8b0118
No known key found for this signature in database
GPG key ID: 3710727397403C91
3 changed files with 18 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

70
resources/qml/Settings/SettingCategory.qml
View file

@ -22,22 +22,10 @@ Button
height: UM.Theme.getSize("section").height
color:
{
if (base.color)
{
return base.color
}
else if (!base.enabled)
if (!base.enabled)
{
return UM.Theme.getColor("setting_category_disabled")
}
else if (base.hovered && base.expanded)
{
return UM.Theme.getColor("setting_category_active_hover")
}
else if (base.pressed || base.expanded)
{
return UM.Theme.getColor("setting_category_active")
}
else if (base.hovered)
{
return UM.Theme.getColor("setting_category_hover")
@ -57,6 +45,21 @@ Button
property var focusItem: base
property bool expanded: definition.expanded
property color text_color:
{
if (!base.enabled)
{
return UM.Theme.getColor("setting_category_disabled_text")
} else if (base.hovered || base.pressed || base.activeFocus)
{
return UM.Theme.getColor("setting_category_active_text")
}
return UM.Theme.getColor("setting_category_text")
}
contentItem: Item
{
anchors.fill: parent
@ -75,25 +78,7 @@ Button
textFormat: Text.PlainText
renderType: Text.NativeRendering
font: UM.Theme.getFont("medium_bold")
color:
{
if (!base.enabled)
{
return UM.Theme.getColor("setting_category_disabled_text")
} else if ((base.hovered || base.activeFocus) && base.expanded)
{
return UM.Theme.getColor("setting_category_active_hover_text")
} else if (base.pressed || base.expanded)
{
return UM.Theme.getColor("setting_category_active_text")
} else if (base.hovered || base.activeFocus)
{
return UM.Theme.getColor("setting_category_hover_text")
} else
{
return UM.Theme.getColor("setting_category_text")
}
}
color: base.text_color
fontSizeMode: Text.HorizontalFit
minimumPointSize: 8
}
@ -118,26 +103,7 @@ Button
anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("thin_margin").width
color:
{
if (!base.enabled)
{
return UM.Theme.getColor("setting_category_disabled_text")
}
else if((base.hovered || base.activeFocus) && base.expanded)
{
return UM.Theme.getColor("setting_category_active_hover_text")
}
else if(base.pressed || base.expanded)
{
return UM.Theme.getColor("setting_category_active_text")
}
else if(base.hovered || base.activeFocus)
{
return UM.Theme.getColor("setting_category_hover_text")
}
return UM.Theme.getColor("setting_category_text")
}
color: base.text_color
source: UM.Theme.getIcon(definition.icon)
width: UM.Theme.getSize("section_icon").width
height: UM.Theme.getSize("section_icon").height

4
resources/themes/cura-dark/theme.json
View file

@ -99,13 +99,9 @@
"setting_category": [75, 80, 83, 255],
"setting_category_disabled": [75, 80, 83, 255],
"setting_category_hover": [75, 80, 83, 255],
"setting_category_active": [75, 80, 83, 255],
"setting_category_active_hover": [75, 80, 83, 255],
"setting_category_text": [255, 255, 255, 152],
"setting_category_disabled_text": [255, 255, 255, 101],
"setting_category_hover_text": [255, 255, 255, 204],
"setting_category_active_text": [255, 255, 255, 204],
"setting_category_active_hover_text": [255, 255, 255, 204],
"setting_category_border": [39, 44, 48, 0],
"setting_category_disabled_border": [39, 44, 48, 0],
"setting_category_hover_border": [12, 169, 227, 255],

4
resources/themes/cura-light/theme.json
View file

@ -274,13 +274,9 @@
"setting_category": [240, 240, 240, 255],
"setting_category_disabled": [255, 255, 255, 255],
"setting_category_hover": [232, 242, 252, 255],
"setting_category_active": [240, 240, 240, 255],
"setting_category_active_hover": [232, 242, 252, 255],
"setting_category_text": [35, 35, 35, 255],
"setting_category_disabled_text": [24, 41, 77, 101],
"setting_category_hover_text": [35, 35, 35, 255],
"setting_category_active_text": [35, 35, 35, 255],
"setting_category_active_hover_text": [35, 35, 35, 255],
"setting_category_border": [240, 240, 240, 255],
"setting_category_disabled_border": [240, 240, 240, 255],
"setting_category_hover_border": [50, 130, 255, 255],