aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/TextField.qml
diff options
context:
space:
mode:
Diffstat (limited to 'src/imports/controls/TextField.qml')
-rw-r--r--src/imports/controls/TextField.qml9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/imports/controls/TextField.qml b/src/imports/controls/TextField.qml
index 0264f25e..87acebcd 100644
--- a/src/imports/controls/TextField.qml
+++ b/src/imports/controls/TextField.qml
@@ -42,11 +42,10 @@ import QtQuick.Templates 2.5 as T
T.TextField {
id: control
- implicitWidth: Math.max(background ? background.implicitWidth : 0,
- placeholderText ? placeholder.implicitWidth + leftPadding + rightPadding : 0)
- || contentWidth + leftPadding + rightPadding
- implicitHeight: Math.max(contentHeight + topPadding + bottomPadding,
- background ? background.implicitHeight : 0,
+ implicitWidth: implicitBackgroundWidth
+ || Math.max(contentWidth, placeholder.implicitWidth) + leftPadding + rightPadding
+ implicitHeight: Math.max(implicitBackgroundHeight,
+ contentHeight + topPadding + bottomPadding,
placeholder.implicitHeight + topPadding + bottomPadding)
padding: 6