GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-13 20:05:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup combobox styling

Browse Source
This commit is contained in:
ChrisTerBeke 2017-09-12 11:59:21 +02:00
parent 9e62c4db15
commit 3f60bc9287
2 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
resources/themes/cura-light/styles.qml
View File

@ -614,7 +614,7 @@ QtObject {
implicitHeight: Theme.getSize("setting_control").height; implicitHeight: Theme.getSize("setting_control").height;
implicitWidth: Theme.getSize("setting_control").width; implicitWidth: Theme.getSize("setting_control").width;
color: Theme.getColor("setting_control") color: (control.hovered || controler._hovered) ? UM.Theme.getColor("setting_control_highlight") : UM.Theme.getColor("setting_control")
Behavior on color { ColorAnimation { duration: 50; } } Behavior on color { ColorAnimation { duration: 50; } }
border.width: Theme.getSize("default_lining").width; border.width: Theme.getSize("default_lining").width;
@ -660,24 +660,11 @@ QtObject {
{ {
background: Rectangle background: Rectangle
{ {
color: color: !enabled ? UM.Theme.getColor("setting_control_disabled") : (control.hovered || controler._hovered) ? UM.Theme.getColor("setting_control_highlight") : UM.Theme.getColor("setting_control")
{
if(!enabled)
{
return UM.Theme.getColor("setting_control_disabled");
}
if(control.hovered)
{
return UM.Theme.getColor("setting_control_highlight");
}
else
{
return UM.Theme.getColor("setting_control");
}
}
border.width: UM.Theme.getSize("default_lining").width border.width: UM.Theme.getSize("default_lining").width
border.color: !enabled ? UM.Theme.getColor("setting_control_disabled_border") : control.hovered ? UM.Theme.getColor("setting_control_border_highlight") : UM.Theme.getColor("setting_control_border") border.color: !enabled ? UM.Theme.getColor("setting_control_disabled_border") : (control.hovered || control._hovered) ? UM.Theme.getColor("setting_control_border_highlight") : UM.Theme.getColor("setting_control_border")
} }
label: Item label: Item
{ {
Label Label
@ -695,6 +682,7 @@ QtObject {
elide: Text.ElideRight elide: Text.ElideRight
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
} }
Rectangle Rectangle
{ {
id: swatch id: swatch
@ -714,6 +702,7 @@ QtObject {
color: if (control.color_override != "") {return control.color_override} else {return control.color;} color: if (control.color_override != "") {return control.color_override} else {return control.color;}
} }
UM.RecolorImage UM.RecolorImage
{ {
id: downArrow id: downArrow

2
resources/themes/cura-light/theme.json
View File

@ -166,7 +166,7 @@
"setting_control": [255, 255, 255, 255], "setting_control": [255, 255, 255, 255],
"setting_control_selected": [24, 41, 77, 255], "setting_control_selected": [24, 41, 77, 255],
"setting_control_highlight": [255, 255, 255, 0], "setting_control_highlight": [255, 255, 255, 255],
"setting_control_border": [127, 127, 127, 255], "setting_control_border": [127, 127, 127, 255],
"setting_control_border_highlight": [12, 169, 227, 255], "setting_control_border_highlight": [12, 169, 227, 255],
"setting_control_text": [27, 27, 27, 255], "setting_control_text": [27, 27, 27, 255],