diff options
| author | Michael Bohlender <michael.bohlender@kdemail.net> | 2017-05-31 15:38:51 +0200 |
|---|---|---|
| committer | Michael Bohlender <michael.bohlender@kdemail.net> | 2017-05-31 15:38:51 +0200 |
| commit | 5a1033bdace740799a6e03389bee30e5a4de5d44 (patch) | |
| tree | 2fba27d47a895ea5d8c229518671aa9e5db3e1d0 | |
| parent | eec0167e9d4a60b871c19af04c5dcbb0985ab105 (diff) | |
| download | kube-5a1033bdace740799a6e03389bee30e5a4de5d44.tar.gz kube-5a1033bdace740799a6e03389bee30e5a4de5d44.zip | |
add focus visualisation to combobox and improve it for buttons
| -rw-r--r-- | framework/qml/Button.qml | 2 | ||||
| -rw-r--r-- | framework/qml/ComboBox.qml | 2 | ||||
| -rw-r--r-- | framework/qml/PositiveButton.qml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/framework/qml/Button.qml b/framework/qml/Button.qml index 72b0e053..7473c140 100644 --- a/framework/qml/Button.qml +++ b/framework/qml/Button.qml | |||
| @@ -37,7 +37,7 @@ T.Button { | |||
| 37 | color: Colors.buttonColor | 37 | color: Colors.buttonColor |
| 38 | 38 | ||
| 39 | border.width: 2 | 39 | border.width: 2 |
| 40 | border.color: root.focus ? Colors.highlightColor : Colors.buttonColor | 40 | border.color: root.focus && !root.pressed ? Colors.highlightColor : Colors.buttonColor |
| 41 | 41 | ||
| 42 | Rectangle { | 42 | Rectangle { |
| 43 | anchors.fill: parent | 43 | anchors.fill: parent |
diff --git a/framework/qml/ComboBox.qml b/framework/qml/ComboBox.qml index f4529f7b..807a416f 100644 --- a/framework/qml/ComboBox.qml +++ b/framework/qml/ComboBox.qml | |||
| @@ -50,7 +50,7 @@ T.ComboBox { | |||
| 50 | 50 | ||
| 51 | background: Rectangle { | 51 | background: Rectangle { |
| 52 | border.width: 1 | 52 | border.width: 1 |
| 53 | border.color: Colors.buttonColor | 53 | border.color: root.focus ? Colors.highlightColor : Colors.buttonColor |
| 54 | color: Colors.viewBackgroundColor | 54 | color: Colors.viewBackgroundColor |
| 55 | } | 55 | } |
| 56 | 56 | ||
diff --git a/framework/qml/PositiveButton.qml b/framework/qml/PositiveButton.qml index 01588d97..aa134d15 100644 --- a/framework/qml/PositiveButton.qml +++ b/framework/qml/PositiveButton.qml | |||
| @@ -37,7 +37,7 @@ T.Button { | |||
| 37 | color: Colors.positiveColor | 37 | color: Colors.positiveColor |
| 38 | 38 | ||
| 39 | border.width: 2 | 39 | border.width: 2 |
| 40 | border.color: root.focus ? Colors.highlightColor : Colors.positiveColor | 40 | border.color: root.focus && !root.pressed ? Colors.highlightColor : Colors.positiveColor |
| 41 | 41 | ||
| 42 | Rectangle { | 42 | Rectangle { |
| 43 | anchors.fill: parent | 43 | anchors.fill: parent |