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/TextField.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/TextField.qml')
| -rw-r--r-- | src/imports/controls/TextField.qml | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/imports/controls/TextField.qml b/src/imports/controls/TextField.qml index 540a8da4..bb21ce84 100644 --- a/src/imports/controls/TextField.qml +++ b/src/imports/controls/TextField.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.TextField { @@ -51,8 +53,8 @@ T.TextField { leftPadding: padding + 4 opacity: enabled ? 1 : 0.2 - color: "#353637" - selectionColor: "#fddd5c" + color: Default.textColor + selectionColor: Default.textSelectionColor selectedTextColor: color verticalAlignment: TextInput.AlignVCenter @@ -65,7 +67,7 @@ T.TextField { text: control.placeholderText font: control.font - color: "#bdbebf" + color: Default.textDisabledColor horizontalAlignment: control.horizontalAlignment verticalAlignment: control.verticalAlignment visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) @@ -77,8 +79,8 @@ T.TextField { implicitWidth: 200 implicitHeight: 40 border.width: control.activeFocus ? 2 : 1 - color: control.enabled ? "#ffffff" : "#353637" - border.color: control.activeFocus ? "#0066ff" : (control.enabled ? "#bdbebf" : "transparent") + color: control.enabled ? Default.backgroundColor : Default.disabledDarkColor + border.color: control.activeFocus ? Default.focusColor : (control.enabled ? Default.disabledLightColor : "transparent") } //! [background] } |