Standardized focus highlighting via AbstractButton for PositiveButton

and Button

1 files changed, 30 insertions, 8 deletions

diff --git a/framework/qml/AbstractButton.qml b/framework/qml/AbstractButton.qml
index a92ab5df..194812da 100644
--- a/framework/qml/AbstractButton.qml
+++ b/framework/qml/AbstractButton.qml
@@ -25,27 +25,49 @@ T.Button {
     id: root
 
     width: Math.max(Units.gridUnit, contentItem.implicitWidth + leftPadding + rightPadding)
-    height: contentItem.implicitHeight + Units.smallSpacing * 2
+    height: contentItem.implicitHeight + topPadding + bottomPadding
 
     padding: Units.largeSpacing
-    topPadding: Units.smallSpacing * 2
-    bottomPadding: Units.smallSpacing *2
+    topPadding: Units.smallSpacing
+    bottomPadding: Units.smallSpacing
 
     clip: true
     hoverEnabled: true
     Keys.onReturnPressed: root.clicked()
 
+    property color color: Colors.buttonColor
+    property color textColor: Colors.textColor
+
     background: Rectangle {
-        color: Colors.buttonColor
+        color: root.color
+
+        Rectangle {
+            anchors.fill: parent
+            visible: root.checked
+            color: Colors.highlightColor
+        }
 
-        border.width: 2
-        border.color:  root.activeFocus && !root.pressed ? Colors.highlightColor : Colors.buttonColor
+        Rectangle {
+            anchors.fill: parent
+            visible: root.hovered || root.visualFocus
+            color: "transparent"
+            border.width: 2
+            border.color: Colors.focusedButtonColor
+        }
 
         Rectangle {
             anchors.fill: parent
-            visible: root.hovered || root.pressed
-            color: root.pressed ? Colors.textColor : Colors.viewBackgroundColor
+            visible: root.pressed
+            color: Colors.textColor
             opacity: 0.2
         }
     }
+
+    contentItem: Label {
+        text: root.text
+        elide: Text.ElideRight
+        horizontalAlignment: Text.AlignHCenter
+        verticalAlignment: Text.AlignVCenter
+        color: root.textColor
+    }
 }