3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-16 03:07:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Change control border colour depending on validation state

Browse source 
The background colour was already changing, but the border colour was only depending on the hover state.

Contributes to issue CURA-4148.
This commit is contained in:
Ghostkeeper 2017-08-21 13:56:07 +02:00
parent d94956dd23
commit 5652bccc58
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
2 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
resources/qml/Settings/SettingTextField.qml
View file

@ -24,6 +24,17 @@ SettingItem
{ {
return UM.Theme.getColor("setting_control_disabled_border") return UM.Theme.getColor("setting_control_disabled_border")
} }
switch(propertyProvider.properties.validationState)
{
case "ValidatorState.Exception":
case "ValidatorState.MinimumError":
case "ValidatorState.MaximumError":
return UM.Theme.getColor("setting_validation_error_border");
case "ValidatorState.MinimumWarning":
case "ValidatorState.MaximumWarning":
return UM.Theme.getColor("setting_validation_warning_border");
}
//Validation is OK.
if(hovered || input.activeFocus) if(hovered || input.activeFocus)
{ {
return UM.Theme.getColor("setting_control_border_highlight") return UM.Theme.getColor("setting_control_border_highlight")

12
resources/themes/cura/styles.qml
View file

@ -81,9 +81,17 @@ QtObject {
border.width: Theme.getSize("default_lining").width border.width: Theme.getSize("default_lining").width
border.color: border.color:
{ {
if (control_enabled) if (control.enabled)
{ {
if (control.hovered) if (control.valueError)
{
return Theme.getColor("setting_validation_error_border");
}
else if (control.valueWarning)
{
return Theme.getColor("setting_validation_warning_border");
}
else if (control.hovered)
{ {
return Theme.getColor("setting_control_border_highlight"); return Theme.getColor("setting_control_border_highlight");
} }