aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/qquicktextinput/data
diff options
context:
space:
mode:
authorAndrew den Exter <andrew.den-exter@nokia.com>2012-04-18 17:20:24 +1000
committerQt by Nokia <qt-info@nokia.com>2012-04-19 06:16:28 +0200
commit7bd68f6447c79aa58a9854bb6c44db00ea36a06a (patch)
treefd5145dda805cd19a2aa2541567a280a5d1fb915 /tests/auto/quick/qquicktextinput/data
parent458eb3cce93162dced2649e44c59f27bb088f07c (diff)
Ensure the cursor delegate position is correct when wrapping.
When inserting text into a TextEdit with implicit width and wrapping the cursor delegate position has to be updated after the width is expanded to the implicit width otherwise it will be positioned in a wrapped location. Change-Id: Ibcb709ec1b4f6827ea8ae919f2e0c932c7372869 Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tests/auto/quick/qquicktextinput/data')
-rw-r--r--tests/auto/quick/qquicktextinput/data/cursorTestExternal.qml1
-rw-r--r--tests/auto/quick/qquicktextinput/data/cursorTestInline.qml1
-rw-r--r--tests/auto/quick/qquicktextinput/data/inputMethodEvent.qml2
3 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/quick/qquicktextinput/data/cursorTestExternal.qml b/tests/auto/quick/qquicktextinput/data/cursorTestExternal.qml
index 9277dcc518..2f43449052 100644
--- a/tests/auto/quick/qquicktextinput/data/cursorTestExternal.qml
+++ b/tests/auto/quick/qquicktextinput/data/cursorTestExternal.qml
@@ -6,6 +6,7 @@ Rectangle { width: 300; height: 300; color: "white"
text: "Hello world!"
id: textInputObject;
objectName: "textInputObject"
+ wrapMode: TextInput.Wrap
cursorDelegate: Cursor {
id:cursorInstance;
objectName: "cursorInstance";
diff --git a/tests/auto/quick/qquicktextinput/data/cursorTestInline.qml b/tests/auto/quick/qquicktextinput/data/cursorTestInline.qml
index efc4b191da..e51a2f3401 100644
--- a/tests/auto/quick/qquicktextinput/data/cursorTestInline.qml
+++ b/tests/auto/quick/qquicktextinput/data/cursorTestInline.qml
@@ -6,6 +6,7 @@ Rectangle { width: 300; height: 300; color: "white"
text: "Hello world!"
id: textInputObject
objectName: "textInputObject"
+ wrapMode: TextInput.WordWrap
cursorDelegate: Item {
id:cursorInstance
objectName: "cursorInstance"
diff --git a/tests/auto/quick/qquicktextinput/data/inputMethodEvent.qml b/tests/auto/quick/qquicktextinput/data/inputMethodEvent.qml
index 7aefdf28f4..907ea68b10 100644
--- a/tests/auto/quick/qquicktextinput/data/inputMethodEvent.qml
+++ b/tests/auto/quick/qquicktextinput/data/inputMethodEvent.qml
@@ -3,4 +3,6 @@ import QtQuick 2.0
TextInput {
focus: true
autoScroll: false
+
+ cursorDelegate: Item { objectName: "cursor" }
}