summaryrefslogtreecommitdiff
path: root/src/controls/TextArea.qml
diff options
context:
space:
mode:
authorRichard Moe Gustavsen <richard.gustavsen@digia.com>2014-09-04 11:37:34 +0200
committerJ-P Nurmi <jpnurmi@digia.com>2014-09-08 15:27:05 +0200
commit6a687a818415b68f28de1046c7455c6f934ab6a6 (patch)
tree52ac3a3e4f4c044a522dcad1ab2944f80ad277c2 /src/controls/TextArea.qml
parentd707b712a6b15ccb11431f018af77634aadae1a1 (diff)
downloadqtquickcontrols-6a687a818415b68f28de1046c7455c6f934ab6a6.tar.gz
TextArea: don't reparent handles out of editor on iOS
Change-Id: I3e3c43e7735c7ea1654475c132be9e8a4baa67fc Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'src/controls/TextArea.qml')
-rw-r--r--src/controls/TextArea.qml4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/TextArea.qml b/src/controls/TextArea.qml
index c6ae1031..39318077 100644
--- a/src/controls/TextArea.qml
+++ b/src/controls/TextArea.qml
@@ -856,7 +856,7 @@ ScrollView {
editor: edit
control: area
z: 1 // above scrollbars
- parent: __scroller // no clip
+ parent: Qt.platform.os === "ios" ? editor : __scroller // no clip
active: area.selectByMouse
delegate: __style.selectionHandle
maximum: cursorHandle.position - 1
@@ -887,7 +887,7 @@ ScrollView {
editor: edit
control: area
z: 1 // above scrollbars
- parent: __scroller // no clip
+ parent: Qt.platform.os === "ios" ? editor : __scroller // no clip
active: area.selectByMouse
delegate: __style.cursorHandle
minimum: edit.hasSelection ? selectionHandle.position + 1 : -1