focus visualisation for buttons

2 files changed, 9 insertions, 2 deletions

diff --git a/framework/qml/Button.qml b/framework/qml/Button.qml
index 664d9b3d..72b0e053 100644
--- a/framework/qml/Button.qml
+++ b/framework/qml/Button.qml
@@ -36,9 +36,12 @@ T.Button {
     background: Rectangle {
         color: Colors.buttonColor
 
+        border.width: 2
+        border.color: root.focus ? Colors.highlightColor : Colors.buttonColor
+
         Rectangle {
             anchors.fill: parent
-            visible: root.hovered || root.pressed || root.activeFocus
+            visible: root.hovered || root.pressed
             color: root.pressed ? Colors.textColor : Colors.viewBackgroundColor
             opacity: 0.2
         }
diff --git a/framework/qml/PositiveButton.qml b/framework/qml/PositiveButton.qml
index 7ec2e2c8..01588d97 100644
--- a/framework/qml/PositiveButton.qml
+++ b/framework/qml/PositiveButton.qml
@@ -36,9 +36,12 @@ T.Button {
     background: Rectangle {
         color: Colors.positiveColor
 
+        border.width: 2
+        border.color: root.focus ? Colors.highlightColor : Colors.positiveColor
+
         Rectangle {
             anchors.fill: parent
-            visible: root.hovered || root.pressed || root.activeFocus
+            visible: root.hovered || root.pressed
             color: root.pressed ? Colors.textColor : Colors.viewBackgroundColor
             opacity: 0.2
         }
@@ -46,6 +49,7 @@ T.Button {
 
     contentItem: Label {
         text: root.text
+        font.underline: root.focus
         elide: Text.ElideRight
         horizontalAlignment: Text.AlignHCenter
         verticalAlignment: Text.AlignVCenter