diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2014-11-04 15:57:43 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2014-11-05 11:06:05 +0100 |
| commit | 74b05b5c86637dcbdcd42320e8f27794fff9f93f (patch) | |
| tree | af4c5bb15631e60b814dd642ae312e92620b7199 /src/controls/Styles/Android/TextFieldStyle.qml | |
| parent | 1f6041cb73cfa0fe8415ba713026b1aa1d018cc9 (diff) | |
Android: text entry implicit size fits 20 characters
A native unlayouted EditText control fits 20 characters by default.
Let Qt Quick Controls Android Style use the same metrics instead of
adjusting to the textual contents. This gives empty TextField,
SpinBox and ComboBox sensible implicit sizes instead of shrinking
them down to something unusable.
Change-Id: I3cd3948aa3d64daada9d0b7d773cebb6627263f6
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Diffstat (limited to 'src/controls/Styles/Android/TextFieldStyle.qml')
| -rw-r--r-- | src/controls/Styles/Android/TextFieldStyle.qml | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/controls/Styles/Android/TextFieldStyle.qml b/src/controls/Styles/Android/TextFieldStyle.qml index 67cd3b786..0edc5c90b 100644 --- a/src/controls/Styles/Android/TextFieldStyle.qml +++ b/src/controls/Styles/Android/TextFieldStyle.qml @@ -37,7 +37,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.4 import QtQuick.Window 2.2 import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 @@ -56,7 +56,7 @@ Style { readonly property real minWidth: styleDef.View_minWidth || 0 readonly property real minHeight: styleDef.View_minHeight || 0 - readonly property real labelWidth: label.implicitWidth + bg.padding.left + bg.padding.right + readonly property real labelWidth: Math.max(label.implicitWidth, metrics.width) + bg.padding.left + bg.padding.right readonly property real labelHeight: label.implicitHeight + bg.padding.top + bg.padding.bottom implicitWidth: Math.max(minWidth, Math.max(bg.implicitWidth, labelWidth)) @@ -81,10 +81,15 @@ Style { readonly property alias selectionColor: label.selectionColor readonly property color selectedTextColor: label.selectedTextColor + TextMetrics { + id: metrics + text: "12345678901234567890" + } + LabelStyle { id: label visible: false - text: control.text + text: control.text || control.placeholderText focused: control.activeFocus window_focused: focused && control.Window.active styleDef: panel.styleDef |