diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-09-27 13:49:22 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-09-28 09:49:31 +0000 |
| commit | f7a63eeda10045abf14ff6c52f2acd9518b0fa36 (patch) | |
| tree | 073170fff7011b06d7f16d039e192dece48e747e /src | |
| parent | d1e0d56946ab54d4777315dbb5116d95ce24601b (diff) | |
Default: make tabs use palettes
Task-number: QTBUG-63369
Change-Id: I92e9c33c3d98f863f6de3764a9796e8aa7a61a4f
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/controls/TabBar.qml | 4 | ||||
| -rw-r--r-- | src/imports/controls/TabButton.qml | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/imports/controls/TabBar.qml b/src/imports/controls/TabBar.qml index ac7fb995..ed2382d3 100644 --- a/src/imports/controls/TabBar.qml +++ b/src/imports/controls/TabBar.qml @@ -63,5 +63,7 @@ T.TabBar { preferredHighlightEnd: width - 40 } - background: Rectangle { } + background: Rectangle { + color: control.palette.window + } } diff --git a/src/imports/controls/TabButton.qml b/src/imports/controls/TabButton.qml index bd506ed6..a6671c04 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) } } |