diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-09-06 23:27:32 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-09-06 23:31:16 +0200 |
| commit | 9a9a9bd1144663e2cb74efdd3d3f6d76c72313f9 (patch) | |
| tree | 2811ccf99d641b040587716f17be8c59a30e11fe /src/imports/controls/TextField.qml | |
| parent | 320647bce7d968b5798dfc6946df555a548e3f8f (diff) | |
| parent | 86180aed5008779b1b94731d9b4c6b1fdac8f3d3 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: If097242bfffe435d3b379a73eb6c8f54bed8495b
Diffstat (limited to 'src/imports/controls/TextField.qml')
| -rw-r--r-- | src/imports/controls/TextField.qml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/imports/controls/TextField.qml b/src/imports/controls/TextField.qml index 5fdb6fc9..540a8da4 100644 --- a/src/imports/controls/TextField.qml +++ b/src/imports/controls/TextField.qml @@ -41,8 +41,10 @@ T.TextField { id: control implicitWidth: Math.max(background ? background.implicitWidth : 0, - placeholder.implicitWidth + leftPadding + rightPadding) - implicitHeight: Math.max(background ? background.implicitHeight : 0, + placeholderText ? placeholder.implicitWidth + leftPadding + rightPadding : 0) + || contentWidth + leftPadding + rightPadding + implicitHeight: Math.max(contentHeight + topPadding + bottomPadding, + background ? background.implicitHeight : 0, placeholder.implicitHeight + topPadding + bottomPadding) padding: 6 |