GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-18 23:55:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ensure bool and enum settings get control highlighted on hover

Browse Source
This commit is contained in:
Jaime van Kessel 2019-08-27 13:38:55 +02:00
parent e8cd5723c9
commit 867a881de9
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/qml/Settings/SettingCheckBox.qml
View File

@ -112,7 +112,7 @@ SettingItem
return UM.Theme.getColor("setting_validation_warning"); return UM.Theme.getColor("setting_validation_warning");
} }
// Validation is OK. // Validation is OK.
if (control.containsMouse || control.activeFocus) if (control.containsMouse || control.activeFocus || hovered)
{ {
return UM.Theme.getColor("setting_control_border_highlight") return UM.Theme.getColor("setting_control_border_highlight")
} }

2
resources/qml/Settings/SettingComboBox.qml
View File

@ -12,7 +12,6 @@ SettingItem
{ {
id: base id: base
property var focusItem: control property var focusItem: control
contents: Cura.ComboBox contents: Cura.ComboBox
{ {
id: control id: control
@ -21,6 +20,7 @@ SettingItem
textRole: "value" textRole: "value"
anchors.fill: parent anchors.fill: parent
highlighted: base.hovered
onActivated: onActivated:
{ {

6
resources/qml/Widgets/ComboBox.qml
View File

@ -14,7 +14,7 @@ import Cura 1.1 as Cura
ComboBox ComboBox
{ {
id: control id: control
property bool highlighted: False
background: Rectangle background: Rectangle
{ {
color: color:
@ -24,7 +24,7 @@ ComboBox
return UM.Theme.getColor("setting_control_disabled") return UM.Theme.getColor("setting_control_disabled")
} }
if (control.hovered || control.activeFocus) if (control.hovered || control.activeFocus || control.highlighted)
{ {
return UM.Theme.getColor("setting_control_highlight") return UM.Theme.getColor("setting_control_highlight")
} }
@ -41,7 +41,7 @@ ComboBox
return UM.Theme.getColor("setting_control_disabled_border") return UM.Theme.getColor("setting_control_disabled_border")
} }
if (control.hovered || control.activeFocus) if (control.hovered || control.activeFocus || control.highlighted)
{ {
return UM.Theme.getColor("setting_control_border_highlight") return UM.Theme.getColor("setting_control_border_highlight")
} }