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 | |
| parent | 5a21b50e6aeda5bed7d16c28022ec023411f1ba4 (diff) | |
ToolButton: support highlighted mode
Change-Id: I8fb754080e204384e0215d60e819f9eaac204de7
Task-number: QTBUG-50018
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| -rw-r--r-- | src/imports/controls/ToolButton.qml | 6 | ||||
| -rw-r--r-- | src/imports/controls/material/ToolButton.qml | 5 | ||||
| -rw-r--r-- | src/imports/controls/universal/ToolButton.qml | 2 | ||||
| -rw-r--r-- | tests/manual/testbench/main.qml | 9 |
4 files changed, 15 insertions, 7 deletions
diff --git a/src/imports/controls/ToolButton.qml b/src/imports/controls/ToolButton.qml index 17fd03c5..d2b948da 100644 --- a/src/imports/controls/ToolButton.qml +++ b/src/imports/controls/ToolButton.qml @@ -69,9 +69,9 @@ T.ToolButton { implicitWidth: 26 implicitHeight: 26 - color: Qt.darker("#33333333", 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) + color: Qt.darker("#33333333", control.enabled && (control.checked || control.highlighted) ? 1.5 : 1.0) + opacity: control.pressed ? 1.0 : control.enabled && (control.checked || control.highlighted) ? 0.5 : 0 + visible: control.pressed || (control.enabled && (control.checked || control.highlighted)) } //! [background] } 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] } diff --git a/src/imports/controls/universal/ToolButton.qml b/src/imports/controls/universal/ToolButton.qml index 6488044b..8310be03 100644 --- a/src/imports/controls/universal/ToolButton.qml +++ b/src/imports/controls/universal/ToolButton.qml @@ -72,7 +72,7 @@ T.ToolButton { implicitHeight: 48 // AppBarThemeCompactHeight color: control.pressed ? control.Universal.listMediumColor : - control.checkable && control.checked ? control.Universal.accentColor : "transparent" + control.enabled && (control.highlighted || control.checked) ? control.Universal.accentColor : "transparent" } //! [background] } diff --git a/tests/manual/testbench/main.qml b/tests/manual/testbench/main.qml index bb36be3f..34baece7 100644 --- a/tests/manual/testbench/main.qml +++ b/tests/manual/testbench/main.qml @@ -69,6 +69,15 @@ ApplicationWindow { pressed: true } ToolButton { + text: "Checked" + checkable: true + checked: true + } + ToolButton { + text: "Highlighted" + highlighted: true + } + ToolButton { text: "Disabled" enabled: false } |