From 2bdf059e6e62fda8e1df108f0a68651e546b0f67 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Thu, 8 Sep 2016 10:29:57 +0200 Subject: 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 --- src/imports/controls/ToolButton.qml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/imports/controls/ToolButton.qml') diff --git a/src/imports/controls/ToolButton.qml b/src/imports/controls/ToolButton.qml index 276e1f83..5d33e3e5 100644 --- a/src/imports/controls/ToolButton.qml +++ b/src/imports/controls/ToolButton.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.ToolButton { @@ -52,7 +54,7 @@ T.ToolButton { contentItem: Text { text: control.text font: control.font - color: control.enabled ? (control.visualFocus ? "#0066ff" : "#26282a") : "#c2c2c2" + color: control.enabled ? (control.visualFocus ? Default.focusColor : Default.textDarkColor) : Default.textDisabledLightColor elide: Text.ElideRight horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter @@ -64,7 +66,7 @@ T.ToolButton { implicitWidth: 40 implicitHeight: 40 - color: Qt.darker("#33333333", control.enabled && (control.checked || control.highlighted) ? 1.5 : 1.0) + 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)) } -- cgit v1.2.3