diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2017-07-22 01:10:35 +0200 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2017-07-22 01:10:35 +0200 |
commit | aba499f81e0e260c6bf6410e28203fa0b05264db (patch) | |
tree | f4df521fe8c9a39256d94ca691b636c19d96835c | |
parent | 56e40fa2fad55c9b1da2ba4c87f66c319e2db1ee (diff) | |
download | kube-aba499f81e0e260c6bf6410e28203fa0b05264db.tar.gz kube-aba499f81e0e260c6bf6410e28203fa0b05264db.zip |
Use the visualFocus property instaed of activeFocus
The activeFocus remains after clicking an element.
-rw-r--r-- | framework/qml/IconButton.qml | 4 | ||||
-rw-r--r-- | framework/qml/PositiveButton.qml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/framework/qml/IconButton.qml b/framework/qml/IconButton.qml index 6c18ed0e..3be0b887 100644 --- a/framework/qml/IconButton.qml +++ b/framework/qml/IconButton.qml | |||
@@ -38,11 +38,11 @@ T.Button { | |||
38 | background: Rectangle { | 38 | background: Rectangle { |
39 | color: Kube.Colors.focusedButtonColor | 39 | color: Kube.Colors.focusedButtonColor |
40 | 40 | ||
41 | visible: root.hovered || root.activeFocus | 41 | visible: root.hovered || root.visualFocus |
42 | 42 | ||
43 | Rectangle { | 43 | Rectangle { |
44 | anchors.fill: parent | 44 | anchors.fill: parent |
45 | visible: root.hovered || root.pressed || root.activeFocus | 45 | visible: root.hovered || root.pressed |
46 | color: root.pressed ? Kube.Colors.textColor : Kube.Colors.viewBackgroundColor | 46 | color: root.pressed ? Kube.Colors.textColor : Kube.Colors.viewBackgroundColor |
47 | opacity: 0.2 | 47 | opacity: 0.2 |
48 | } | 48 | } |
diff --git a/framework/qml/PositiveButton.qml b/framework/qml/PositiveButton.qml index 4293d082..a3b68d26 100644 --- a/framework/qml/PositiveButton.qml +++ b/framework/qml/PositiveButton.qml | |||
@@ -38,7 +38,7 @@ T.Button { | |||
38 | color: Colors.positiveColor | 38 | color: Colors.positiveColor |
39 | 39 | ||
40 | border.width: 2 | 40 | border.width: 2 |
41 | border.color: root.activeFocus && !root.pressed ? Colors.highlightColor : Colors.positiveColor | 41 | border.color: root.visualFocus && !root.pressed ? Colors.highlightColor : Colors.positiveColor |
42 | 42 | ||
43 | Rectangle { | 43 | Rectangle { |
44 | anchors.fill: parent | 44 | anchors.fill: parent |