diff options
Diffstat (limited to 'src/imports/controls')
| -rw-r--r-- | src/imports/controls/ToolBar.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/ToolButton.qml | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/imports/controls/ToolBar.qml b/src/imports/controls/ToolBar.qml index e77c5998..cd1bbdc3 100644 --- a/src/imports/controls/ToolBar.qml +++ b/src/imports/controls/ToolBar.qml @@ -50,6 +50,6 @@ T.ToolBar { background: Rectangle { implicitHeight: 40 - color: Default.delegateColor + color: control.palette.button } } 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 } } |