diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-10-10 23:01:53 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-10-11 13:05:36 +0000 |
| commit | 57f877bd984a0befb57626421a6e36ed373056ce (patch) | |
| tree | ea6162e4fa8806b64b1af0cb4059a6cd0da73d5e /src/imports/controls/TextArea.qml | |
| parent | aa634f86429ad15fced74a5a65e7d170b5e7e9ff (diff) | |
TextArea: fix implicit size
Same as 0cb0962 for TextField.
Change-Id: I1538df1b31a8b7254a219923623c5dd586d65059
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/TextArea.qml')
| -rw-r--r-- | src/imports/controls/TextArea.qml | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/imports/controls/TextArea.qml b/src/imports/controls/TextArea.qml index e6a50336..10f06302 100644 --- a/src/imports/controls/TextArea.qml +++ b/src/imports/controls/TextArea.qml @@ -41,6 +41,15 @@ import Qt.labs.templates 1.0 as T T.TextArea { id: control + implicitWidth: Math.max(contentWidth + leftPadding + rightPadding, + background ? background.implicitWidth : 0, + placeholder ? placeholder.implicitWidth + leftPadding + rightPadding : 0) + implicitHeight: Math.max(contentHeight + topPadding + bottomPadding, + background ? background.implicitHeight : 0, + placeholder ? placeholder.implicitHeight + topPadding + bottomPadding : 0) + + padding: 6 + color: enabled ? Theme.textColor : Theme.disabledColor selectionColor: Theme.selectionColor selectedTextColor: Theme.selectedTextColor @@ -49,12 +58,13 @@ T.TextArea { placeholder: Text { x: control.leftPadding y: control.topPadding - width: control.availableWidth - height: control.availableHeight + width: control.width - (control.leftPadding + control.rightPadding) + height: control.height - (control.topPadding + control.bottomPadding) font: control.font color: control.Theme.disabledColor visible: !control.length + elide: Text.ElideRight } //! [placeholder] } |