diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-03-03 09:39:40 +0100 |
|---|---|---|
| committer | Jari-Pekka Nurmi <jpnurmi@theqtcompany.com> | 2015-03-06 08:46:40 +0200 |
| commit | f50aafacfa18bf7ab12433076ef95d9af9b80c71 (patch) | |
| tree | b6824edd2528dc71f9cddad9f18c119c07d7ad08 /src/imports/controls/TextArea.qml | |
| parent | 02c7a226b69b2ad1acf86fa76553a9ede9870e42 (diff) | |
QQuickAbstractTextArea: inherit QQuickTextEdit
Change-Id: I974dd801d3cd3cf3d7024e1c8727ec0607e084f3
Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/TextArea.qml')
| -rw-r--r-- | src/imports/controls/TextArea.qml | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/src/imports/controls/TextArea.qml b/src/imports/controls/TextArea.qml index 699221f4..ea2bb68e 100644 --- a/src/imports/controls/TextArea.qml +++ b/src/imports/controls/TextArea.qml @@ -40,30 +40,15 @@ import QtQuick.Controls 2.0 AbstractTextArea { id: control - implicitWidth: Math.max(background ? background.implicitWidth : 0, - Math.max(edit ? edit.implicitWidth : 0, - placeholder ? placeholder.implicitWidth : 0) + leftPadding + rightPadding) - implicitHeight: Math.max(background ? background.implicitHeight : 0, - Math.max(edit ? edit.implicitHeight : 0, - placeholder ? placeholder.implicitHeight : 0) + topPadding + bottomPadding) - Accessible.name: text Accessible.multiLine: true Accessible.role: Accessible.EditableText - Accessible.readOnly: !edit || edit.readOnly + Accessible.readOnly: readOnly Accessible.description: placeholder ? placeholder.text : "" - edit: TextEdit { - 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 - selectedTextColor: style.selectedTextColor - Keys.forwardTo: control - } + color: style.textColor + selectionColor: style.selectionColor + selectedTextColor: style.selectedTextColor placeholder: Text { x: control.leftPadding @@ -73,6 +58,6 @@ AbstractTextArea { color: control.style.textColor opacity: control.style.disabledOpacity - visible: edit ? !edit.length : !control.text + visible: !control.length } } |