diff options
Diffstat (limited to 'resources/qml/Settings/SettingOptionalExtruder.qml')
-rw-r--r-- | resources/qml/Settings/SettingOptionalExtruder.qml | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/resources/qml/Settings/SettingOptionalExtruder.qml b/resources/qml/Settings/SettingOptionalExtruder.qml index 2a4db2ab31..22f03d44a2 100644 --- a/resources/qml/Settings/SettingOptionalExtruder.qml +++ b/resources/qml/Settings/SettingOptionalExtruder.qml @@ -99,7 +99,7 @@ SettingItem value: control.currentText != "" ? control.model.getItem(control.currentIndex).color : "transparent" } - indicator: UM.RecolorImage + indicator: UM.ColorImage { id: downArrow x: control.width - width - control.rightPadding @@ -108,8 +108,6 @@ SettingItem source: UM.Theme.getIcon("ChevronSingleDown") width: UM.Theme.getSize("standard_arrow").width height: UM.Theme.getSize("standard_arrow").height - sourceSize.width: width + 5 * screenScaleFactor - sourceSize.height: width + 5 * screenScaleFactor color: UM.Theme.getColor("setting_control_button") } @@ -128,17 +126,22 @@ SettingItem } return UM.Theme.getColor("setting_control") } + 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 (control.hovered || control.activeFocus) + if(base.hovered) { - return UM.Theme.getColor("border_main") + return UM.Theme.getColor("text_field_border_hovered"); } - return UM.Theme.getColor("border_field_light") + return UM.Theme.getColor("border_field_light"); } } @@ -159,7 +162,7 @@ SettingItem background: Rectangle { id: swatch - height: Math.round(parent.height / 2) + height: UM.Theme.getSize("standard_arrow").width width: height radius: Math.round(width / 2) anchors.right: parent.right |