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

Write out border colour as full-fledged function

Browse Source 
This makes it easier to read and to modify this functionality rather than a string of ternary operators. It's about to become more complicated too.

Contributes to issue CURA-4148.
This commit is contained in:
Ghostkeeper 2017-08-21 11:55:47 +02:00
parent 42b8e87d00
commit 226bb7b070
No known key found for this signature in database
GPG Key ID: C5F96EE2BC0F7E75
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
resources/themes/cura/styles.qml
View File

@ -66,18 +66,37 @@ QtObject {
else if(control.valueWarning) else if(control.valueWarning)
{ {
return Theme.getColor("setting_validation_warning"); return Theme.getColor("setting_validation_warning");
} else }
else
{ {
return Theme.getColor("setting_control"); return Theme.getColor("setting_control");
} }
} else { }
else
{
return Theme.getColor("setting_control_disabled"); return Theme.getColor("setting_control_disabled");
} }
} }
border.width: Theme.getSize("default_lining").width border.width: Theme.getSize("default_lining").width
border.color: !control.enabled ? Theme.getColor("setting_control_disabled_border") : border.color:
control.hovered ? Theme.getColor("setting_control_border_highlight") : Theme.getColor("setting_control_border") {
if (control_enabled)
{
if (control.hovered)
{
return Theme.getColor("setting_control_border_highlight");
}
else
{
return Theme.getColor("setting_control_border");
}
}
else
{
return Theme.getColor("setting_control_disabled_border");
}
}
UM.RecolorImage { UM.RecolorImage {
id: downArrow id: downArrow
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter