diff options
Diffstat (limited to 'resources/qml/Settings')
-rw-r--r-- | resources/qml/Settings/SettingExtruder.qml | 16 | ||||
-rw-r--r-- | resources/qml/Settings/SettingOptionalExtruder.qml | 16 | ||||
-rw-r--r-- | resources/qml/Settings/SettingTextField.qml | 14 |
3 files changed, 29 insertions, 17 deletions
diff --git a/resources/qml/Settings/SettingExtruder.qml b/resources/qml/Settings/SettingExtruder.qml index d0bffe0f37..567161b8f6 100644 --- a/resources/qml/Settings/SettingExtruder.qml +++ b/resources/qml/Settings/SettingExtruder.qml @@ -125,18 +125,22 @@ SettingItem } return UM.Theme.getColor("setting_control") } - borderColor: (base.hovered || control.activeFocus) ? UM.Theme.getSize("text_field_border_hovered") : "transparent" + borderColor: control.activeFocus ? UM.Theme.getSize("text_field_border_active") : "transparent" liningColor: { - if (!enabled) + if(!enabled) + { + return UM.Theme.getColor("setting_control_disabled_border"); + } + if(control.activeFocus) { - return UM.Theme.getColor("setting_control_disabled_border") + return UM.Theme.getColor("text_field_border_active"); } - if (base.hovered || control.activeFocus) + if(base.hovered) { - return UM.Theme.getColor("text_field_border_hovered") + return UM.Theme.getColor("text_field_border_hovered"); } - return UM.Theme.getColor("border_field_light") + return UM.Theme.getColor("border_field_light"); } } diff --git a/resources/qml/Settings/SettingOptionalExtruder.qml b/resources/qml/Settings/SettingOptionalExtruder.qml index 8c57bc8651..22f03d44a2 100644 --- a/resources/qml/Settings/SettingOptionalExtruder.qml +++ b/resources/qml/Settings/SettingOptionalExtruder.qml @@ -126,18 +126,22 @@ SettingItem } return UM.Theme.getColor("setting_control") } - borderColor: (base.hovered || control.activeFocus) ? UM.Theme.getColor("text_field_border_hovered") : "transparent" + borderColor: control.activeFocus ? UM.Theme.getColor("text_field_border_active") : "transparent" liningColor: { - if (!enabled) + if(!enabled) + { + return UM.Theme.getColor("setting_control_disabled_border"); + } + if(control.activeFocus) { - return UM.Theme.getColor("setting_control_disabled_border") + return UM.Theme.getColor("text_field_border_active"); } - if (base.hovered || control.activeFocus) + if(base.hovered) { - return UM.Theme.getColor("text_field_border_hovered") + return UM.Theme.getColor("text_field_border_hovered"); } - return UM.Theme.getColor("border_field_light") + return UM.Theme.getColor("border_field_light"); } } diff --git a/resources/qml/Settings/SettingTextField.qml b/resources/qml/Settings/SettingTextField.qml index 8ec37f98d2..f0e3b2cacb 100644 --- a/resources/qml/Settings/SettingTextField.qml +++ b/resources/qml/Settings/SettingTextField.qml @@ -32,12 +32,12 @@ SettingItem anchors.fill: parent - borderColor: (hovered || input.activeFocus) ? UM.Theme.getColor("text_field_border_hovered") : "transparent" + borderColor: input.activeFocus ? UM.Theme.getColor("text_field_border_active") : "transparent" liningColor: { if(!enabled) { - return UM.Theme.getColor("text_field_border_disabled") + return UM.Theme.getColor("text_field_border_disabled"); } switch(propertyProvider.properties.validationState) { @@ -51,11 +51,15 @@ SettingItem return UM.Theme.getColor("setting_validation_warning"); } //Validation is OK. - if(hovered || input.activeFocus) + if(input.activeFocus) { - return UM.Theme.getColor("text_field_border_hovered") + return UM.Theme.getColor("text_field_border_active"); } - return UM.Theme.getColor("text_field_border") + if(hovered) + { + return UM.Theme.getColor("text_field_border_hovered"); + } + return UM.Theme.getColor("text_field_border"); } color: { |