diff options
author | Ghostkeeper <rubend@tutanota.com> | 2022-05-10 17:04:06 +0300 |
---|---|---|
committer | Ghostkeeper <rubend@tutanota.com> | 2022-05-10 17:04:06 +0300 |
commit | fb8f50e6ef5c0c5693900bb2e5d7a06aea596f92 (patch) | |
tree | f307cbbab66e1de8fc410e73e401067210d57db8 /resources/qml/Settings/SettingExtruder.qml | |
parent | 5c7423e007ffebddb43eda840cab8411a355f981 (diff) | |
parent | 97e2d6a4322d59b0bf7eacc7bec9621ce8cdc934 (diff) |
Merge branch '5.0'
Diffstat (limited to 'resources/qml/Settings/SettingExtruder.qml')
-rw-r--r-- | resources/qml/Settings/SettingExtruder.qml | 16 |
1 files changed, 10 insertions, 6 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"); } } |