From 4d96e8160e477893aa8394de526f8f45901f5e54 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Thu, 17 Dec 2015 15:14:35 +0100 Subject: Button: visualize disabled state more clearly Change-Id: I0b1bec4aa2c17e875a9a9580e10db80f6b21bc35 Task-number: QTBUG-50008 Reviewed-by: J-P Nurmi --- src/imports/controls/Button.qml | 2 ++ src/imports/controls/material/Button.qml | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'src/imports') diff --git a/src/imports/controls/Button.qml b/src/imports/controls/Button.qml index 7fd7580c..1196f56b 100644 --- a/src/imports/controls/Button.qml +++ b/src/imports/controls/Button.qml @@ -58,6 +58,7 @@ T.Button { height: control.availableHeight text: control.text font: control.font + opacity: enabled || highlighted ? 1 : 0.3 color: control.highlighted ? "#ffffff" : (control.pressed ? "#26282a" : "#353637") horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter @@ -69,6 +70,7 @@ T.Button { background: Rectangle { implicitWidth: 100 implicitHeight: 40 + opacity: enabled ? 1 : 0.3 color: control.pressed ? (control.highlighted ? "#585a5c" : "#e4e4e4") : (control.highlighted ? "#353637" : "#ffffff") border.color: control.pressed ? "#26282a" : "#353637" } 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 -- cgit v1.2.3