diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-08-10 15:50:32 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-08-11 10:04:56 +0000 |
| commit | 4092df376916ad9477547ecd4ef4679dc59e0fdf (patch) | |
| tree | e6c44404b16ffc4a69e09e3edc7f4887a0d54afb | |
| parent | 0bf6a3f4255c2e082db1f84de19034f05c48ce56 (diff) | |
Material: restore ToolButton checked state
Task-number: QTBUG-54917
Change-Id: Ib236d818fdc1582277e7a9fe367e9c92ff8648a1
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| -rw-r--r-- | src/imports/controls/material/ToolButton.qml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/imports/controls/material/ToolButton.qml b/src/imports/controls/material/ToolButton.qml index 56101435..df4b23f8 100644 --- a/src/imports/controls/material/ToolButton.qml +++ b/src/imports/controls/material/ToolButton.qml @@ -55,7 +55,8 @@ T.ToolButton { contentItem: Text { text: control.text font: control.font - color: control.enabled ? control.Material.primaryTextColor : control.Material.hintTextColor + color: !control.enabled ? control.Material.hintTextColor : + control.checked || control.highlighted ? control.Material.accent : control.Material.primaryTextColor elide: Text.ElideRight horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter @@ -76,6 +77,6 @@ T.ToolButton { pressed: control.pressed anchor: control active: control.enabled && (control.down || control.visualFocus || control.hovered) - color: control.checked ? control.Material.highlightedRippleColor : control.Material.rippleColor + color: control.Material.rippleColor } } |