diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-09-27 09:52:22 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-09-27 10:15:18 +0000 |
| commit | 73f1d564161f825e39904c78f3f05105d3bb9329 (patch) | |
| tree | bc46f0799c25b46316dbb379b058941bc05ae864 /src/imports/controls/ToolButton.qml | |
| parent | bf4d5c7091889cd4f253d27c479687df5348b817 (diff) | |
Default: make ToolBar & ToolButton use palettes
Task-number: QTBUG-63369
Change-Id: I7b8037c52892d8dfb4a38450c58101353d9d2d1f
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/ToolButton.qml')
| -rw-r--r-- | src/imports/controls/ToolButton.qml | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/imports/controls/ToolButton.qml b/src/imports/controls/ToolButton.qml index 67233868..511bd6eb 100644 --- a/src/imports/controls/ToolButton.qml +++ b/src/imports/controls/ToolButton.qml @@ -53,7 +53,7 @@ T.ToolButton { icon.width: 24 icon.height: 24 - icon.color: enabled ? (visualFocus ? control.palette.highlight : Default.textDarkColor) : Default.textDisabledLightColor + icon.color: visualFocus ? control.palette.highlight : control.palette.buttonText contentItem: IconLabel { spacing: control.spacing @@ -63,15 +63,14 @@ T.ToolButton { icon: control.icon text: control.text font: control.font - color: control.enabled ? (control.visualFocus ? control.palette.highlight : Default.textDarkColor) : Default.textDisabledLightColor + color: control.visualFocus ? control.palette.highlight : control.palette.buttonText } background: Rectangle { implicitWidth: 40 implicitHeight: 40 - color: Qt.darker(Default.toolButtonColor, control.enabled && (control.checked || control.highlighted) ? 1.5 : 1.0) - opacity: control.down ? 1.0 : control.enabled && (control.checked || control.highlighted) ? 0.5 : 0 - visible: control.down || (control.enabled && (control.checked || control.highlighted)) + opacity: control.down ? 1.0 : 0.5 + color: control.down || control.checked || control.highlighted ? control.palette.mid : control.palette.button } } |