From 67f3da65d7d11af025a9bdd54d08ca0bf764c3ce Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Fri, 22 Apr 2016 00:18:25 +0200 Subject: 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 --- src/imports/controls/material/TextArea.qml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/imports/controls/material/TextArea.qml') 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 -- cgit v1.2.3