diff options
author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-17 15:05:35 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-17 14:40:42 +0000 |
commit | 182b4d5fe364655f9bdc05e8b708b6fe39a7e269 (patch) | |
tree | 4f0fcd135b2318b1016180cb060bf9c071c807ba /src/imports/controls/material/ToolButton.qml | |
parent | 5a21b50e6aeda5bed7d16c28022ec023411f1ba4 (diff) |
ToolButton: support highlighted mode
Change-Id: I8fb754080e204384e0215d60e819f9eaac204de7
Task-number: QTBUG-50018
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/material/ToolButton.qml')
-rw-r--r-- | src/imports/controls/material/ToolButton.qml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/imports/controls/material/ToolButton.qml b/src/imports/controls/material/ToolButton.qml index 4f72f4ef..ce755d2b 100644 --- a/src/imports/controls/material/ToolButton.qml +++ b/src/imports/controls/material/ToolButton.qml @@ -70,9 +70,8 @@ T.ToolButton { implicitWidth: 26 implicitHeight: 26 - color: control.activeFocus || (control.checkable && control.checked) - ? control.Material.flatButtonFocusColor : control.Material.flatButtonPressColor - visible: control.pressed || control.activeFocus || (control.checkable && control.checked) + color: control.pressed ? control.Material.flatButtonPressColor : control.Material.flatButtonFocusColor + visible: control.enabled && (control.pressed || control.activeFocus || control.checked || control.highlighted) } //! [background] } |