diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-04-22 00:18:25 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-04-26 13:31:06 +0000 |
| commit | 67f3da65d7d11af025a9bdd54d08ca0bf764c3ce (patch) | |
| tree | 9fc5e79e31a82d39d25f8a00835a1115b55b08a7 /src/imports/controls/material/TextArea.qml | |
| parent | 1780a817fce77f4875f001c2b95b41cd2cd06f2b (diff) | |
Allow attaching TextArea to a Flickable
It is not always possible to let TextArea grow infinitely, but in
some cases it should be scrollable on its own. Even though it is not
a built-in feature of TextArea like in Qt Quick Controls 1, this change
makes it straight-forward to attach TextArea to a Flickable. This makes
TextArea behave like a standalone scrollable editor.
Change-Id: I8181e8ebe0edbcdfef2c30c9e102db7cbe4ff705
Task-number: QTBUG-51677
Task-number: QTBUG-52169
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/material/TextArea.qml')
| -rw-r--r-- | src/imports/controls/material/TextArea.qml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/imports/controls/material/TextArea.qml b/src/imports/controls/material/TextArea.qml index aa9cb12f..8098ac42 100644 --- a/src/imports/controls/material/TextArea.qml +++ b/src/imports/controls/material/TextArea.qml @@ -56,6 +56,7 @@ T.TextArea { selectedTextColor: Material.primaryHighlightedTextColor cursorDelegate: Rectangle { id: cursor + clip: true // TODO color: control.Material.accentColor width: 2 visible: control.activeFocus && control.selectionStart === control.selectionEnd @@ -99,7 +100,7 @@ T.TextArea { //! [background] background: Rectangle { - y: control.height - height - control.bottomPadding / 2 + y: parent.height - height - control.bottomPadding / 2 implicitWidth: 120 height: control.activeFocus ? 2 : 1 color: control.activeFocus ? control.Material.accentColor : control.Material.hintTextColor |