From 5a1033bdace740799a6e03389bee30e5a4de5d44 Mon Sep 17 00:00:00 2001
From: Michael Bohlender <michael.bohlender@kdemail.net>
Date: Wed, 31 May 2017 15:38:51 +0200
Subject: add focus visualisation to combobox and improve it for buttons

---
 framework/qml/Button.qml         | 2 +-
 framework/qml/ComboBox.qml       | 2 +-
 framework/qml/PositiveButton.qml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'framework')

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 {
         color: Colors.buttonColor
 
         border.width: 2
-        border.color: root.focus ? Colors.highlightColor : Colors.buttonColor
+        border.color:  root.focus && !root.pressed ? Colors.highlightColor : Colors.buttonColor
 
         Rectangle {
             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 {
 
     background: Rectangle {
         border.width: 1
-        border.color: Colors.buttonColor
+        border.color: root.focus ? Colors.highlightColor : Colors.buttonColor
         color: Colors.viewBackgroundColor
     }
 
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 {
         color: Colors.positiveColor
 
         border.width: 2
-        border.color: root.focus ? Colors.highlightColor : Colors.positiveColor
+        border.color: root.focus && !root.pressed ? Colors.highlightColor : Colors.positiveColor
 
         Rectangle {
             anchors.fill: parent
-- 
cgit v1.2.3