diff options
| author | Jens Bache-Wiig <jens.bache-wiig@digia.com> | 2013-05-29 13:32:25 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-30 09:21:20 +0200 |
| commit | cf3d91d6db86fb74d5968405371c4e83b1410d86 (patch) | |
| tree | 798c3ae3fdf3651da45ed151d52d44e909829c9a /src/styles/Desktop/TextFieldStyle.qml | |
| parent | c536d0cf324bd7cb2299ecd3e5212b9826b2bf42 (diff) | |
| download | qtquickcontrols-cf3d91d6db86fb74d5968405371c4e83b1410d86.tar.gz | |
Make styleHints a variant map
The styleHints are not really flexible enough as a stringlist
as we want to be able to pass actual properties. Since we already
have a properties member of the style we should move all of our
internal properties to that.
Change-Id: Id7a66ade243461f54c41b9ec89144668aaf19483
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'src/styles/Desktop/TextFieldStyle.qml')
| -rw-r--r-- | src/styles/Desktop/TextFieldStyle.qml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/styles/Desktop/TextFieldStyle.qml b/src/styles/Desktop/TextFieldStyle.qml index 9a093d2a..ee6779eb 100644 --- a/src/styles/Desktop/TextFieldStyle.qml +++ b/src/styles/Desktop/TextFieldStyle.qml @@ -64,9 +64,9 @@ Style { property color selectedTextColor: syspal.highlightedText - property bool rounded: hints.indexOf("rounded") > -1 + property bool rounded: !!hints["rounded"] property int topMargin: style === "mac" ? 3 : 2 - property int leftMargin: rounded ? 8 : 4 + property int leftMargin: rounded ? 12 : 4 property int rightMargin: leftMargin property int bottomMargin: 2 @@ -76,7 +76,7 @@ Style { FocusFrame { anchors.fill: parent - visible: textfield.activeFocus && textfieldstyle.styleHint("focuswidget") + visible: textfield.activeFocus && textfieldstyle.styleHint("focuswidget") && !rounded } } } |