diff options
| author | Richard Dale <richard.dale@codethink.co.uk> | 2013-07-04 09:56:52 +0100 |
|---|---|---|
| committer | Richard Dale <richard.dale@codethink.co.uk> | 2013-07-04 09:56:52 +0100 |
| commit | acf9e50d52c4d09a1aed9490bb2f3c5de7dce9bb (patch) | |
| tree | 5b05df5a9e67f397bc7629f0921bc30c64bcc03e /src/styles/Desktop/TextFieldStyle.qml | |
| parent | a7e874ddf3496766903fc88e52fb61573c3d3f74 (diff) | |
| parent | aa4ddfd8443f07badc0899d835027e46c6e0dfd8 (diff) | |
| download | qtquickcontrols-baserock/morph.tar.gz | |
Merge v5.1.0 releasebaserock/morph
Diffstat (limited to 'src/styles/Desktop/TextFieldStyle.qml')
| -rw-r--r-- | src/styles/Desktop/TextFieldStyle.qml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/styles/Desktop/TextFieldStyle.qml b/src/styles/Desktop/TextFieldStyle.qml index 9a093d2a..8f71a45c 100644 --- a/src/styles/Desktop/TextFieldStyle.qml +++ b/src/styles/Desktop/TextFieldStyle.qml @@ -48,7 +48,7 @@ Style { sunken: true hasFocus: control.activeFocus - hover: __containsMouse + hover: hovered hints: control.styleHints SystemPalette { @@ -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 } } } |