diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-05 20:39:42 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-05 20:39:42 +0200 |
| commit | 850f5868b7eef9746c49570ed4c8bfb2c5177ecc (patch) | |
| tree | 91de4ddc14c65e946b2a87b33a5596a95d4c89ec /src/imports/controls/ToolButton.qml | |
| parent | eb1b76053f2c6f35f8a33bec71536ca24651a711 (diff) | |
| parent | 0bd5c342013bfae63f1a7e13a0f531cb0a2c8581 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: I59e9e2044184f96f1e66577f6f639d028a825b9e
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 abe0a225..371d1546 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 ? Default.focusColor : 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 ? Default.focusColor : 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 } } |