diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-01-16 09:37:42 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-01-16 09:38:19 +0100 |
| commit | 08e6333450bc28c61fa804101df3ae8bef4e9568 (patch) | |
| tree | acb8973cbbd2319ab75e460e35a3278459d717df /src/imports/controls/fusion/TabButton.qml | |
| parent | ef5e426bed3b1362394c7cc0c97522bb20cacff0 (diff) | |
| parent | 744d14b468eb4bdd4dabf72ef7acdca1bc07ea5d (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: Ibd1490e8d958361e55ac272dff75c9361239958b
Diffstat (limited to 'src/imports/controls/fusion/TabButton.qml')
| -rw-r--r-- | src/imports/controls/fusion/TabButton.qml | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/src/imports/controls/fusion/TabButton.qml b/src/imports/controls/fusion/TabButton.qml index 0875f327..bdcee759 100644 --- a/src/imports/controls/fusion/TabButton.qml +++ b/src/imports/controls/fusion/TabButton.qml @@ -77,33 +77,22 @@ T.TabButton { height: control.height - (control.checked ? 0 : 2) border.color: Qt.lighter(Fusion.outline(control.palette), 1.1) - gradient: control.checked ? selectedGradient : normalGradient - Gradient { - id: selectedGradient + gradient: Gradient { GradientStop { position: 0 - color: Qt.lighter(Fusion.tabFrameColor(control.palette), 1.04) + color: control.checked ? Qt.lighter(Fusion.tabFrameColor(control.palette), 1.04) + : Qt.darker(Fusion.tabFrameColor(control.palette), 1.08) } GradientStop { - position: 1 - color: Fusion.tabFrameColor(control.palette) - } - } - - Gradient { - id: normalGradient - GradientStop { - position: 0 - color: Qt.darker(Fusion.tabFrameColor(control.palette), 1.08) - } - GradientStop { - position: 0.85 - color: Qt.darker(Fusion.tabFrameColor(control.palette), 1.08) + position: control.checked ? 0 : 0.85 + color: control.checked ? Qt.lighter(Fusion.tabFrameColor(control.palette), 1.04) + : Qt.darker(Fusion.tabFrameColor(control.palette), 1.08) } GradientStop { position: 1 - color: Qt.darker(Fusion.tabFrameColor(control.palette), 1.16) + color: control.checked ? Fusion.tabFrameColor(control.palette) + : Qt.darker(Fusion.tabFrameColor(control.palette), 1.16) } } } |