aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/TextField.qml
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2015-06-18 23:23:29 +0200
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2015-10-04 09:46:26 +0000
commit0cb096251c4f5af79126e71cfa7a7f9e910dac95 (patch)
tree63f803c2937a8077d43afcb286e25f0b69aecad6 /src/imports/controls/TextField.qml
parent07b219ad7dea4f534ab214ea51673b3bece53d6c (diff)
TextField: fix implicit size
Change-Id: Iceaa5af83b2a9f0eb03829829fcfc4e4a6261100 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/TextField.qml')
-rw-r--r--src/imports/controls/TextField.qml5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/imports/controls/TextField.qml b/src/imports/controls/TextField.qml
index 7a00591f..1aecbb23 100644
--- a/src/imports/controls/TextField.qml
+++ b/src/imports/controls/TextField.qml
@@ -41,6 +41,11 @@ import Qt.labs.templates 1.0 as T
T.TextField {
id: control
+ implicitWidth: Math.max(background ? background.implicitWidth : 0,
+ placeholder ? placeholder.implicitWidth + leftPadding + rightPadding : 0)
+ implicitHeight: Math.max(background ? background.implicitHeight : 0,
+ placeholder ? placeholder.implicitHeight + topPadding + bottomPadding : 0)
+
padding: 6
color: enabled ? Theme.textColor : Theme.disabledColor