aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/universal/Button.qml
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2015-11-13 19:42:11 +0100
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2015-11-16 12:20:25 +0000
commit06066c8ed22016220c126106b6c0228d34242ba5 (patch)
tree90bebe1e8a69989e2ac903b2ea40cf98815b5c41 /src/imports/controls/universal/Button.qml
parent794e948421f4e6e02a2b3e23693f6283baa4d938 (diff)
Universal: handle Button::highlighted
Change-Id: I060980e8110cdc9158ce7f1030186cbdbadbe48e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/universal/Button.qml')
-rw-r--r--src/imports/controls/universal/Button.qml4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/controls/universal/Button.qml b/src/imports/controls/universal/Button.qml
index 617d8a03..b84dc61a 100644
--- a/src/imports/controls/universal/Button.qml
+++ b/src/imports/controls/universal/Button.qml
@@ -78,8 +78,8 @@ T.Button {
implicitHeight: 32
color: control.pressed ? control.Universal.baseMediumLowColor :
- control.enabled && control.checkable && control.checked ? control.Universal.accentColor :
- control.Universal.baseLowColor
+ control.enabled && (control.highlighted || control.checked) ? control.Universal.accentColor :
+ control.Universal.baseLowColor
}
//! [background]
}