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/TabButton.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/TabButton.qml')
| -rw-r--r-- | src/imports/controls/TabButton.qml | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/imports/controls/TabButton.qml b/src/imports/controls/TabButton.qml index cd343262..964f4e1f 100644 --- a/src/imports/controls/TabButton.qml +++ b/src/imports/controls/TabButton.qml @@ -53,7 +53,7 @@ T.TabButton { icon.width: 24 icon.height: 24 - icon.color: Color.transparent(!checked ? Default.textLightColor : down ? Default.textDarkColor : Default.textColor, enabled ? 1 : 0.3) + icon.color: checked ? control.palette.windowText : control.palette.brightText contentItem: IconLabel { spacing: control.spacing @@ -63,14 +63,12 @@ T.TabButton { icon: control.icon text: control.text font: control.font - color: Color.transparent(!control.checked ? Default.textLightColor : control.down ? Default.textDarkColor : Default.textColor, - enabled ? 1 : 0.3) + color: checked ? control.palette.windowText : control.palette.brightText } background: Rectangle { implicitHeight: 40 - color: control.down - ? (control.checked ? Default.tabButtonCheckedPressedColor : Default.tabButtonPressedColor) - : (control.checked ? "transparent" : Default.tabButtonColor) + color: Color.blend(control.checked ? control.palette.window : control.palette.dark, + control.palette.mid, control.down ? 0.5 : 0.0) } } |