diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-09-25 22:34:39 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-10-15 14:45:24 +0000 |
| commit | 8d85150408593ceaee4c0b6d83705da77c7534a2 (patch) | |
| tree | ebb863fa6321035f03bc472ba7e414c51f422766 | |
| parent | 8a1612920d040c4256eed146a369ec0827a8a1c9 (diff) | |
Button & ToolButton: visualize checked state
Change-Id: Ia345ed22d62d4beb77287228f38ef2df118836b1
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| -rw-r--r-- | src/imports/controls/Button.qml | 7 | ||||
| -rw-r--r-- | src/imports/controls/ToolButton.qml | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/imports/controls/Button.qml b/src/imports/controls/Button.qml index ae5f446c..82fe82b4 100644 --- a/src/imports/controls/Button.qml +++ b/src/imports/controls/Button.qml @@ -72,9 +72,10 @@ T.Button { implicitHeight: 36 radius: 3 - color: Qt.tint(!control.enabled ? control.Theme.disabledColor : - control.activeFocus ? control.Theme.focusColor : control.Theme.accentColor, - control.pressed ? control.Theme.pressColor : "transparent") + color: Qt.darker(Qt.tint(!control.enabled ? control.Theme.disabledColor : + control.activeFocus ? control.Theme.focusColor : control.Theme.accentColor, + control.pressed ? control.Theme.pressColor : "transparent"), + control.checkable && control.checked ? 1.5 : 1.0) } //! [background] } diff --git a/src/imports/controls/ToolButton.qml b/src/imports/controls/ToolButton.qml index 06fdd763..b6d33549 100644 --- a/src/imports/controls/ToolButton.qml +++ b/src/imports/controls/ToolButton.qml @@ -69,9 +69,9 @@ T.ToolButton { implicitWidth: 26 implicitHeight: 26 - opacity: 0.25 - color: control.Theme.pressColor - visible: control.pressed + color: Qt.darker(control.Theme.pressColor, control.checkable && control.checked ? 1.5 : 1.0) + opacity: control.pressed ? 1.0 : control.checkable && control.checked ? 0.5 : 0 + visible: control.pressed || (control.checkable && control.checked) } //! [background] } |