diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-09-06 18:52:28 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-09-06 20:27:00 +0200 |
| commit | 86180aed5008779b1b94731d9b4c6b1fdac8f3d3 (patch) | |
| tree | c1c4ac6daa87042196fa66a92ea56737930c0920 /src/imports/controls/material/TextField.qml | |
| parent | 9a55b34e292c725a4fa394a71e0a3d851e4e488f (diff) | |
| parent | 9ae57848671419b2622e254af8642fef7b1b7c33 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: Ief98cd56abd13cfa4e30578e150207462a8243b8
Diffstat (limited to 'src/imports/controls/material/TextField.qml')
| -rw-r--r-- | src/imports/controls/material/TextField.qml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/imports/controls/material/TextField.qml b/src/imports/controls/material/TextField.qml index a6406afa..25811322 100644 --- a/src/imports/controls/material/TextField.qml +++ b/src/imports/controls/material/TextField.qml @@ -42,9 +42,11 @@ T.TextField { id: control implicitWidth: Math.max(background ? background.implicitWidth : 0, - placeholder.implicitWidth + leftPadding + rightPadding) - implicitHeight: Math.max(background ? background.implicitHeight : 0, - placeholder.implicitHeight + 1 + topPadding + bottomPadding) + placeholderText ? placeholder.implicitWidth + leftPadding + rightPadding : 0) + || contentWidth + leftPadding + rightPadding + implicitHeight: Math.max(contentHeight + topPadding + bottomPadding, + background ? background.implicitHeight : 0, + placeholder.implicitHeight + topPadding + bottomPadding) topPadding: 8 bottomPadding: 16 |