diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-04-20 16:06:15 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-04-20 16:23:33 +0200 |
| commit | e8cd9c045840b4a9db4e20aaaa16ea6f841ed1c1 (patch) | |
| tree | fc23ddbab837a5d4ae5da00c4a7ebd0ac31e4be8 /src/imports/controls/material/TextArea.qml | |
| parent | b772b5e349c48260a1c0458f841b2e6e82daf0b1 (diff) | |
| parent | 1cb0faf7886d9df99adfb61560e369387691f89c (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ia8879787703c32db44119b25be10adc83adc40bb
Diffstat (limited to 'src/imports/controls/material/TextArea.qml')
| -rw-r--r-- | src/imports/controls/material/TextArea.qml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/imports/controls/material/TextArea.qml b/src/imports/controls/material/TextArea.qml index 41940dd5..b952d319 100644 --- a/src/imports/controls/material/TextArea.qml +++ b/src/imports/controls/material/TextArea.qml @@ -44,11 +44,12 @@ T.TextArea { implicitWidth: Math.max(contentWidth + leftPadding + rightPadding, background ? background.implicitWidth : 0, placeholder.implicitWidth + leftPadding + rightPadding) - implicitHeight: Math.max(contentHeight + topPadding + bottomPadding, + implicitHeight: Math.max(contentHeight + 1 + topPadding + bottomPadding, background ? background.implicitHeight : 0, - placeholder.implicitHeight + topPadding + bottomPadding) + placeholder.implicitHeight + 1 + topPadding + bottomPadding) - padding: 6 + topPadding: 8 + bottomPadding: 16 color: enabled ? Material.primaryTextColor : Material.hintTextColor selectionColor: Material.accentColor @@ -98,7 +99,7 @@ T.TextArea { //! [background] background: Rectangle { - y: control.height - height + y: control.height - height - control.bottomPadding / 2 implicitWidth: 120 height: control.activeFocus ? 2 : 1 color: control.activeFocus ? control.Material.accentColor : control.Material.hintTextColor |