diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2016-09-08 10:29:57 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2016-09-12 08:27:37 +0000 |
| commit | 2bdf059e6e62fda8e1df108f0a68651e546b0f67 (patch) | |
| tree | f7b3bdf8a5b61814b827217bf3ad66e8879cd670 /src/imports/controls/TabButton.qml | |
| parent | 86180aed5008779b1b94731d9b4c6b1fdac8f3d3 (diff) | |
Default: consolidate style colors into a singleton
This reduces all of the duplicate literals that we currently have.
Task-number: QTBUG-55867
Change-Id: I28f1f646d25f2f6578d52b4ba96f8f0f3ad6706b
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/imports/controls/TabButton.qml')
| -rw-r--r-- | src/imports/controls/TabButton.qml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/imports/controls/TabButton.qml b/src/imports/controls/TabButton.qml index 77a4ca17..d7a5a7cd 100644 --- a/src/imports/controls/TabButton.qml +++ b/src/imports/controls/TabButton.qml @@ -35,6 +35,8 @@ ****************************************************************************/ import QtQuick 2.6 +import QtQuick.Controls 2.1 +import QtQuick.Controls.impl 2.1 import QtQuick.Templates 2.1 as T T.TabButton { @@ -54,7 +56,7 @@ T.TabButton { font: control.font elide: Text.ElideRight opacity: enabled ? 1 : 0.3 - color: !control.checked ? "#ffffff" : control.down ? "#26282a" : "#353637" + color: !control.checked ? Default.textLightColor : control.down ? Default.textDarkColor : Default.textColor horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter } @@ -63,7 +65,9 @@ T.TabButton { //! [background] background: Rectangle { implicitHeight: 40 - color: control.down ? (control.checked ? "#e4e4e4" : "#585a5c") : (control.checked ? "transparent" : "#353637") + color: control.down + ? (control.checked ? Default.tabButtonCheckedPressedColor : Default.tabButtonPressedColor) + : (control.checked ? "transparent" : Default.tabButtonColor) } //! [background] } |