From d3b07cd2025b0ee1ba76b8e92492f035ff447f33 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Wed, 26 Jul 2017 13:04:22 -0600
Subject: Bring back the highlight on buttons

---
 framework/qml/AbstractButton.qml     | 3 +++
 framework/qml/DelegateBackground.qml | 2 ++
 framework/qml/PositiveButton.qml     | 2 ++
 3 files changed, 7 insertions(+)

(limited to 'framework')

diff --git a/framework/qml/AbstractButton.qml b/framework/qml/AbstractButton.qml
index c49a490b..d55176ea 100644
--- a/framework/qml/AbstractButton.qml
+++ b/framework/qml/AbstractButton.qml
@@ -26,6 +26,8 @@ T.Button {
 
     property color color: Colors.buttonColor
     property color textColor: Colors.textColor
+    property alias highlightColor: background.highlightColor
+    property alias highlightOpacity: background.highlightOpacity
     property alias horizontalAlignment: label.horizontalAlignment
     property alias verticalAlignment: label.verticalAlignment
 
@@ -41,6 +43,7 @@ T.Button {
     Keys.onReturnPressed: root.clicked()
 
     background: DelegateBackground {
+        id: background
         selected: root.checked
         focused: root.hovered || root.visualFocus
         color: root.color
diff --git a/framework/qml/DelegateBackground.qml b/framework/qml/DelegateBackground.qml
index 633a39ca..4059d69a 100644
--- a/framework/qml/DelegateBackground.qml
+++ b/framework/qml/DelegateBackground.qml
@@ -25,6 +25,7 @@ Rectangle {
     property bool focused: false
     property bool selected: false
     property color highlightColor: Kube.Colors.highlightColor
+    property alias highlightOpacity: highlight.opacity
     property color borderColor: Kube.Colors.focusedButtonColor
 
     Rectangle {
@@ -33,6 +34,7 @@ Rectangle {
         color: root.highlightColor
     }
     Rectangle {
+        id: highlight
         anchors.fill: parent
         visible: root.focused && !root.selected
         color: root.highlightColor
diff --git a/framework/qml/PositiveButton.qml b/framework/qml/PositiveButton.qml
index 32bd7508..f158ad10 100644
--- a/framework/qml/PositiveButton.qml
+++ b/framework/qml/PositiveButton.qml
@@ -21,4 +21,6 @@ import org.kube.framework 1.0
 AbstractButton {
     color: Colors.positiveColor
     textColor: Colors.highlightedTextColor
+    highlightColor: Colors.viewBackgroundColor
+    highlightOpacity: 0.2
 }
-- 
cgit v1.2.3