diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-03-02 18:42:28 +0100 |
|---|---|---|
| committer | Jari-Pekka Nurmi <jpnurmi@theqtcompany.com> | 2015-03-03 02:02:13 +0200 |
| commit | aceaa093f90fd006e5b2d9523b8ed6cab7b8577d (patch) | |
| tree | 40176808133244acfcf09e861ee6c7e997ca8ab0 /src/imports/controls/TextArea.qml | |
| parent | f965016e5d001e7a844893a46902fb5b0ef84262 (diff) | |
Update src/imports to use top/left/right/bottomPadding
Change-Id: I9c72db2d8f44429a7c87baaad663b88c7e1f1bb9
Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/TextArea.qml')
| -rw-r--r-- | src/imports/controls/TextArea.qml | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/imports/controls/TextArea.qml b/src/imports/controls/TextArea.qml index e88fafc8..699221f4 100644 --- a/src/imports/controls/TextArea.qml +++ b/src/imports/controls/TextArea.qml @@ -42,10 +42,10 @@ AbstractTextArea { implicitWidth: Math.max(background ? background.implicitWidth : 0, Math.max(edit ? edit.implicitWidth : 0, - placeholder ? placeholder.implicitWidth : 0) + padding.left + padding.right) + placeholder ? placeholder.implicitWidth : 0) + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, Math.max(edit ? edit.implicitHeight : 0, - placeholder ? placeholder.implicitHeight : 0) + padding.top + padding.bottom) + placeholder ? placeholder.implicitHeight : 0) + topPadding + bottomPadding) Accessible.name: text Accessible.multiLine: true @@ -54,10 +54,10 @@ AbstractTextArea { Accessible.description: placeholder ? placeholder.text : "" edit: TextEdit { - x: padding.left - y: padding.top - width: parent.width - padding.left - padding.right - height: parent.height - padding.top - padding.bottom + x: control.leftPadding + y: control.topPadding + width: parent.width - control.leftPadding - control.rightPadding + height: parent.height - control.topPadding - control.bottomPadding color: style.textColor selectionColor: style.selectionColor @@ -66,10 +66,10 @@ AbstractTextArea { } placeholder: Text { - x: padding.left - y: padding.top - width: parent.width - padding.left - padding.right - height: parent.height - padding.top - padding.bottom + x: control.leftPadding + y: control.topPadding + width: parent.width - control.leftPadding - control.rightPadding + height: parent.height - control.topPadding - control.bottomPadding color: control.style.textColor opacity: control.style.disabledOpacity |