diff options
author | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2015-11-13 10:22:41 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-11-19 17:49:45 +0000 |
commit | 6ca831b18f361924cab39b65d1a1e8b31e60b3fc (patch) | |
tree | 37fce3bddfc8f48fa3ba503174fdcb8c4df5a359 /src/imports/controls/TextField.qml | |
parent | f507472c306f13f4cc965ffd9f56f8e436b0e04b (diff) |
Adjust default style to match current specs.
There are still more changes to come.
Change-Id: I94ed2c5d649d72d90e43120841c2457091200b59
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/TextField.qml')
-rw-r--r-- | src/imports/controls/TextField.qml | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/imports/controls/TextField.qml b/src/imports/controls/TextField.qml index ce5534e4..25e1461d 100644 --- a/src/imports/controls/TextField.qml +++ b/src/imports/controls/TextField.qml @@ -35,7 +35,6 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T T.TextField { @@ -48,9 +47,9 @@ T.TextField { padding: 6 - color: enabled ? Theme.textColor : Theme.disabledColor - selectionColor: Theme.selectionColor - selectedTextColor: Theme.selectedTextColor +// color: enabled ? "" : "#bdbebf" +// selectionColor: Theme.selectionColor +// selectedTextColor: Theme.selectedTextColor verticalAlignment: TextInput.AlignVCenter Text { @@ -62,7 +61,7 @@ T.TextField { text: control.placeholderText font: control.font - color: control.Theme.disabledColor + color: "#a0a1a2" horizontalAlignment: control.horizontalAlignment verticalAlignment: control.verticalAlignment visible: !control.displayText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) @@ -71,10 +70,10 @@ T.TextField { //! [background] background: Rectangle { - implicitWidth: 120 // TODO - border.width: control.activeFocus ? 2 : 1 - border.color: control.activeFocus ? control.Theme.focusColor : control.Theme.frameColor - radius: 3 + implicitWidth: 200 + implicitHeight: 40 +// border.width: control.activeFocus ? 2 : 1 + border.color: "#bdbebf" } //! [background] } |