diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-04-24 01:02:24 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-04-23 23:12:08 +0000 |
| commit | e9476ae5b9385ce5a6b4a55f984543aa180492bd (patch) | |
| tree | a08daab06213e8347f724a0e939c0b210eb357e0 /src/imports/controls/Button.qml | |
| parent | 2df3b1b930e3d151e14ace3f464b9caeadff0b04 (diff) | |
Use Theme.disabledColor to get sensible looks in disabled state
Change-Id: I28831c979f8fa040fc3388eec6f2256930a3d91d
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/Button.qml')
| -rw-r--r-- | src/imports/controls/Button.qml | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/imports/controls/Button.qml b/src/imports/controls/Button.qml index 0dd9b6ee..6ce91739 100644 --- a/src/imports/controls/Button.qml +++ b/src/imports/controls/Button.qml @@ -60,7 +60,6 @@ AbstractButton { text: control.text color: control.Theme.selectedTextColor elide: Text.ElideRight - opacity: enabled ? 1.0 : control.Theme.disabledOpacity horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter } @@ -70,9 +69,8 @@ AbstractButton { implicitHeight: 26 radius: control.Theme.roundness - opacity: control.enabled ? 1.0 : control.Theme.disabledOpacity - color: Qt.tint(Qt.tint(control.Theme.accentColor, - control.activeFocus ? control.Theme.focusColor : "transparent"), - control.pressed ? control.Theme.pressColor : "transparent") + color: Qt.tint(!control.enabled ? control.Theme.disabledColor : + control.activeFocus ? control.Theme.focusColor : control.Theme.accentColor, + control.pressed ? control.Theme.pressColor : "transparent") } } |