diff options
| author | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2015-11-23 11:03:43 +0100 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2015-11-23 12:03:30 +0000 |
| commit | bd7bdf9752bc07b44bb10231dd9c23d0e9c643d5 (patch) | |
| tree | 9a5477d0fe873bb8c6ad0f321a85ec2039dd9fb7 /src/imports/controls/material/Button.qml | |
| parent | 501c1a54f7e080541edbfaf54ba03c4b72ff9342 (diff) | |
Visualize Material Button's highlighted state
Change-Id: I1c638c0b70a0ba8d0f5cfe1d7e41fd514c38c1c9
Task-number: QTBUG-49551
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.qml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/imports/controls/material/Button.qml b/src/imports/controls/material/Button.qml index 2ffcd056..5275343f 100644 --- a/src/imports/controls/material/Button.qml +++ b/src/imports/controls/material/Button.qml @@ -59,7 +59,7 @@ T.Button { height: control.availableHeight text: control.text - color: control.Material.primaryTextColor + color: control.highlighted ? control.Material.primaryHighlightedTextColor : control.Material.primaryTextColor horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter elide: Text.ElideRight @@ -72,9 +72,10 @@ T.Button { implicitHeight: 36 radius: 2 - color: !control.enabled ? control.Material.raisedButtonDisabledColor : - (control.pressed ? control.Material.raisedButtonPressColor : - (control.activeFocus ? control.Material.raisedButtonHoverColor : control.Material.raisedButtonColor)) + color: !control.enabled ? (control.highlighted ? control.Material.raisedHighlightedButtonDisabledColor : control.Material.raisedButtonDisabledColor) : + (control.pressed ? (control.highlighted ? control.Material.raisedHighlightedButtonPressColor : control.Material.raisedButtonPressColor) : + (control.activeFocus ? (control.highlighted ? control.Material.raisedHighlightedButtonHoverColor : control.Material.raisedButtonHoverColor) : + (control.highlighted ? control.Material.raisedHighlightedButtonColor : control.Material.raisedButtonColor))) Behavior on color { ColorAnimation { |