aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/material/Button.qml
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2015-12-17 15:14:35 +0100
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2015-12-17 14:40:47 +0000
commit4d96e8160e477893aa8394de526f8f45901f5e54 (patch)
tree9101402aa0205ed941f89ff85da8909e306e9f87 /src/imports/controls/material/Button.qml
parent182b4d5fe364655f9bdc05e8b708b6fe39a7e269 (diff)
Button: visualize disabled state more clearly
Change-Id: I0b1bec4aa2c17e875a9a9580e10db80f6b21bc35 Task-number: QTBUG-50008 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/material/Button.qml')
-rw-r--r--src/imports/controls/material/Button.qml3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/imports/controls/material/Button.qml b/src/imports/controls/material/Button.qml
index 5204fd3b..2644a0aa 100644
--- a/src/imports/controls/material/Button.qml
+++ b/src/imports/controls/material/Button.qml
@@ -61,7 +61,8 @@ T.Button {
text: control.text
font: control.font
- color: control.highlighted ? control.Material.primaryHighlightedTextColor : control.Material.primaryTextColor
+ color: !control.enabled ? control.Material.hintTextColor :
+ control.highlighted ? control.Material.primaryHighlightedTextColor : control.Material.primaryTextColor
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
elide: Text.ElideRight