Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/textHandlerCleanUpRTM into lp:ubuntu-ui-toolkit/rtm

[Christian Dywan]

New text handler visuals and improved behavior

[lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/textHandlerCleanUpRTM]

1160. By Christian Dywan on 2015-02-17

Remove intentional CI trap and disable debugging visuals

[Zsombor Egri (zsombi)]

Cool stuff, it is good to see the text input shaping nicely.

review: Approve

[lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/textHandlerCleanUpRTM]

1161. By Christian Dywan on 2015-02-17

Put some labels in the textinput test to avoid overlapping

1162. By Christian Dywan on 2015-02-18

Ensure text field overlays have priority

1163. By Christian Dywan on 2015-02-19

Anchor text popover to draggedItem so it doesn't overlap handlers

1164. By Christian Dywan on 2015-02-19

Parent handlers on root item and demo in custom textfield case

1165. By Christian Dywan on 2015-02-19

Take offset of input to main into account

1166. By Christian Dywan on 2015-02-20

Consider parent flickable contentY to catch scrolling

1167. By Christian Dywan on 2015-02-23

Change scrolling hack to properties absX and absY

[Zsombor Egri (zsombi)]

latest changes are also good to go.

review: Approve

[lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/textHandlerCleanUpRTM]

1168. By Christian Dywan on 2015-02-26

Assign properties to ensure unit tests finds handlers

1169. By Christian Dywan on 2015-02-27

Ensure test_textinput can tap in the bottom right of the textfield

1170. By Christian Dywan on 2015-03-02

Backport launcher build fix for Qt5.4 from staging

1171. By Christian Dywan on 2015-03-02

Reposition draggedItem once it receives its width

Otherwise the area may be placed at absolute 0/0

Unmerged revisions

1171. By Christian Dywan on 2015-03-02

Reposition draggedItem once it receives its width

Otherwise the area may be placed at absolute 0/0

1170. By Christian Dywan on 2015-03-02

Backport launcher build fix for Qt5.4 from staging

1169. By Christian Dywan on 2015-02-27

Ensure test_textinput can tap in the bottom right of the textfield

1168. By Christian Dywan on 2015-02-26

Assign properties to ensure unit tests finds handlers

1167. By Christian Dywan on 2015-02-23

Change scrolling hack to properties absX and absY

1166. By Christian Dywan on 2015-02-20

Consider parent flickable contentY to catch scrolling

1165. By Christian Dywan on 2015-02-19

Take offset of input to main into account

1164. By Christian Dywan on 2015-02-19

Parent handlers on root item and demo in custom textfield case

1163. By Christian Dywan on 2015-02-19

Anchor text popover to draggedItem so it doesn't overlap handlers

1162. By Christian Dywan on 2015-02-18

Ensure text field overlays have priority

=== modified file 'examples/ubuntu-ui-toolkit-gallery/TextInputs.qml'
--- examples/ubuntu-ui-toolkit-gallery/TextInputs.qml	2014-10-09 09:09:12 +0000
+++ examples/ubuntu-ui-toolkit-gallery/TextInputs.qml	2015-03-02 12:00:38 +0000
@@ -33,8 +33,9 @@
                               "ligula tortor, luctus id elementum vel, varius vel augue. "+
                               "Nunc porta mattis bibendum. Nam vitae sapien ipsum, non viverra neque."
 
-    property string richText: "<i>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</i> "+
-                              "<b>Nunc pretium iaculis risus, sed vehicula odio varius ac.</b> "+
+    // http://qt-project.org/doc/qt-5/richtext-html-subset.html
+    property string richText: "<big>Lorem ipsum dolor sit amet</big>, <i>consectetur adipiscing elit.</i>" +
+                              "<b>Nunc pretium iaculis risus</b>, <small>sed vehicula odio varius ac.</small>" +
                               "<u>Etiam orci lectus, bibendum in vulputate ac, tristique quis dui.</u>"
 
     TemplateSection {
@@ -81,6 +82,7 @@
                 text: i18n.tr("Nobody type here")
                 readOnly: true
                 width: parent.width
+                horizontalAlignment: TextInput.AlignHCenter
             }
         }
 
@@ -92,6 +94,7 @@
                 text: i18n.tr("No interaction allowed")
                 enabled: false
                 width: parent.width
+                horizontalAlignment: TextInput.AlignRight
             }
         }
     }

=== modified file 'modules/Ubuntu/Components/InputHandler.qml'
--- modules/Ubuntu/Components/InputHandler.qml	2014-11-12 10:28:55 +0000
+++ modules/Ubuntu/Components/InputHandler.qml	2015-03-02 12:00:38 +0000
@@ -32,11 +32,8 @@
     property Item input
     // the Flickable holding the input instance
     property Flickable flickable
-    // selection cursor mode
-    property bool selectionCursor: input && input.selectedText !== ""
 
-    // item filling the text input visible area, used to check teh caret handler
-    // visibility
+    // item filling the visible text input area used to check handler visibility
     property Item visibleArea: Item {
         parent: flickable
         anchors.fill: parent
@@ -46,7 +43,7 @@
     property real lineSpacing: units.dp(3)
     property real lineSize: input.font.pixelSize + lineSpacing
     // input x/y distance from the frame
-    property point frameDistance: Qt.point(0,0)
+    property point frameDistance: Qt.point(flickable.x, flickable.y)
 
     // signal triggered when popup should be opened
     signal pressAndHold(int pos)
@@ -76,7 +73,7 @@
     }
 
     // internal properties/functions
-    readonly property bool singleLine: input && input.hasOwnProperty("validator")
+    readonly property bool singleLine: input.hasOwnProperty("validator")
     property var flickableList: new Array()
     property bool textChanged: false
     property var popover
@@ -94,12 +91,9 @@
     readonly property Flickable grandScroller: firstFlickableParent(main)
     readonly property Flickable scroller: (scrollingDisabled && grandScroller) ? grandScroller : flickable
 
-    // ensures the text cusrorRectangle is always in the internal Flickable's visible area
+    // ensures the text cursorRectangle is always in the internal Flickable's visible area
     function ensureVisible(rect)
     {
-        if (rect === undefined) {
-            rect = input.cursorRectangle;
-        }
         if (flickable.moving || flickable.flicking)
             return;
         if (flickable.contentX >= rect.x)
@@ -165,7 +159,7 @@
         if (!main.focus || !mouseInSelection(mouse)) {
             activateInput();
             input.cursorPosition = pressedPosition = mousePosition(mouse);
-            if (noAutoselect === undefined || !noAutoselect) {
+            if (!noAutoselect) {
                 input.selectWord();
             }
         }
@@ -216,15 +210,6 @@
         }
     }
 
-    // returns the styles for the cursors depending on the position property given
-    function textCursorStyle(positionProperty) {
-        switch (positionProperty) {
-        case "cursorPosition": return main.__styleInstance.mainCursorStyle;
-        case "selectionStart": return main.__styleInstance.selectionStartCursorStyle;
-        case "selectionEnd": return main.__styleInstance.selectionEndCursorStyle;
-        }
-    }
-
     // moves the cursor one page forward with or without positioning the cursor
     function movePage(forward) {
         var cx = input.cursorRectangle.x;
@@ -320,7 +305,7 @@
     // input specific signals
     Connections {
         target: input
-        onCursorRectangleChanged: ensureVisible()
+        onCursorRectangleChanged: ensureVisible(input.cursorRectangle)
         onTextChanged: {
             textChanged = true;
             if (oldText != input.text) {
@@ -402,12 +387,10 @@
     }
     function handleDblClick(event, touch) {
         if (main.selectByMouse) {
-            openContextMenu(event, false);
+            openContextMenu(event, false, touch);
             // turn selection state temporarily so the selection is not cleared on release
             state = "selection";
-            if (touch) {
-                suppressReleaseEvent = true;
-            }
+            suppressReleaseEvent = true;
         }
     }
 
@@ -416,7 +399,7 @@
     Mouse.onPressed: handlePressed(mouse, false)
     Mouse.onReleased: handleReleased(mouse, false)
     Mouse.onPositionChanged: handleMove(mouse, false)
-    Mouse.onDoubleClicked: handleDblClick(mouse)
+    Mouse.onDoubleClicked: handleDblClick(mouse, false)
 
     // right button handling
     MouseArea {
@@ -478,31 +461,27 @@
     onPressed: handlePressed(touchPoints[0], true)
     onReleased: handleReleased(touchPoints[0], true)
 
+    property Item cursorPositionCursor: null
+    property Item selectionStartCursor: null
+    property Item selectionEndCursor: null
+
     // cursors to use when text is selected
     Connections {
-        property Item selectionStartCursor: null
-        property Item selectionEndCursor: null
         target: input
         onSelectedTextChanged: {
-            if (selectedText !== "" && input.cursorDelegate) {
+            if (selectedText !== "") {
                 if (!selectionStartCursor) {
                     selectionStartCursor = input.cursorDelegate.createObject(
                                 input, {
                                     "positionProperty": "selectionStart",
-                                    "height": lineSize,
                                     "handler": inputHandler,
-                                    "objectName": "selectionStartCursor"
                                     }
                                 );
                     moveSelectionCursor(selectionStartCursor);
-                }
-                if (!selectionEndCursor) {
                     selectionEndCursor = input.cursorDelegate.createObject(
                                 input, {
                                     "positionProperty": "selectionEnd",
-                                    "height": lineSize,
                                     "handler": inputHandler,
-                                    "objectName": "selectionEndCursor"
                                     }
                                 );
                     moveSelectionCursor(selectionEndCursor);
@@ -511,8 +490,6 @@
                 if (selectionStartCursor) {
                     selectionStartCursor.destroy();
                     selectionStartCursor = null;
-                }
-                if (selectionEndCursor) {
                     selectionEndCursor.destroy();
                     selectionEndCursor = null;
                 }
@@ -534,6 +511,7 @@
             var pos = input.positionToRectangle(input[cursor.positionProperty]);
             cursor.x = pos.x;
             cursor.y = pos.y;
+            cursor.height = pos.height;
             ensureVisible(pos);
         }
     }

=== modified file 'modules/Ubuntu/Components/TextArea.qml'
--- modules/Ubuntu/Components/TextArea.qml	2014-11-12 03:51:45 +0000
+++ modules/Ubuntu/Components/TextArea.qml	2015-03-02 12:00:38 +0000
@@ -759,8 +759,7 @@
 
         function linesHeight(lines)
         {
-            var lineHeight = editor.font.pixelSize * lines + inputHandler.lineSpacing * lines
-            return lineHeight + 2 * frameSpacing;
+            return inputHandler.lineSize * lines + 2 * frameSpacing;
         }
 
         function frameSize()
@@ -804,9 +803,9 @@
             margins: internal.frameSpacing
         }
         // hint is shown till user types something in the field
-        visible: (editor.getText(0, editor.length) == "") && !editor.inputMethodComposing
+        visible: (editor.text == "") && !editor.inputMethodComposing
         color: Theme.palette.normal.backgroundText
-        fontSize: "medium"
+        font: editor.font
         elide: Text.ElideRight
         wrapMode: Text.WordWrap
     }
@@ -871,7 +870,6 @@
                 main: control
                 input: editor
                 flickable: flicker
-                frameDistance: Qt.point(flicker.x, flicker.y)
             }
         }
     }

=== modified file 'modules/Ubuntu/Components/TextCursor.qml'
--- modules/Ubuntu/Components/TextCursor.qml	2014-11-12 03:51:45 +0000
+++ modules/Ubuntu/Components/TextCursor.qml	2015-03-02 12:00:38 +0000
@@ -21,10 +21,10 @@
 Ubuntu.StyledItem {
     id: cursorItem
 
-    width: units.dp(1)
+    height: cursorRectangle.height
 
     /*
-      Property holding the text input's custor position property. Can be one of
+      Property holding the text input's cursor position property. Can be one of
       the following ones: cursorPosition, selectionStart and selectionEnd.
       */
     property string positionProperty: "cursorPosition"
@@ -41,21 +41,29 @@
                                            handler.main.cursorDelegate :
                                            __styleInstance.cursorDelegate
 
-    // depending on the positionProperty, we chose different styles
-    style: Theme.createStyleComponent(handler.textCursorStyle(positionProperty), cursorItem);
+    style: Theme.createStyleComponent("TextCursorStyle.qml", cursorItem);
 
     objectName: "textCursor"
     //Caret instance from the style.
     property Item caret: __styleInstance.caret
-    property real caretX: caret ? caret.x : 0
-    property real caretY: caret ? caret.y : 0
+    property int absX: {
+        return fakeCursor.parent.mapFromItem(handler.main, cursorItem.x, cursorItem.y).x
+    }
+    property int absY: {
+        // Take parent flickable movement into account
+        var flickable = handler.main;
+        do {
+            flickable = flickable.parent;
+        } while (!flickable.contentY && flickable != fakeCursor.parent);
+        return fakeCursor.parent.mapFromItem(handler.main, cursorItem.x, cursorItem.y).y
+    }
 
-    // returns the mapped cursor position to a position relative to the main component
-    function mappedCursorPosition(pos) {
-        var cpos = cursorItem[pos];
-        if (handler) {
-            cpos += handler.frameDistance[pos] - handler.flickable["content"+pos.toUpperCase()];
-        }
+    // Returns "x" or "y" relative to the item handlers are a child of
+    function mappedCursorPosition(coordinate) {
+        var cpos = cursorItem["abs" + coordinate.toUpperCase()];
+        cpos += handler.frameDistance[coordinate];
+        cpos += handler.input[coordinate];
+        cpos -= handler.flickable["content" + coordinate.toUpperCase()];
         return cpos;
     }
     /*
@@ -79,12 +87,16 @@
         }
     }
 
+    Binding {
+        target: handler
+        property: "cursorPositionCursor"
+        value: cursorItem
+    }
+
     function openPopover() {
-        if (!visible || opacity === 0.0 || dragger.dragActive) {
-            return;
-        }
-
-        if (contextMenuVisible) {
+        if (!visible
+         || opacity === 0.0
+         || dragger.dragActive) {
             return;
         }
 
@@ -96,19 +108,15 @@
         if (component === undefined)
             component = Qt.resolvedUrl("TextInputPopover.qml");
 
-        var popup;
-        if (fakeCursor.visible) {
-            popup = PopupUtils.open(component, cursorItem, {
-                "target": handler.main,
-            });
-        } else {
-            // if the cursor is out of the visible viewport, anchor the
-            // contextual menu to the input field
-            popup = PopupUtils.open(component, handler.main, {
-                "target": handler.main,
-            });
-            cursorItem.Component.onDestruction.connect(popup.__closePopup);
-        }
+        // if the cursor is out of the visible viewport, anchor the
+        // contextual menu to the input field
+        var anchor = fakeCursor.visible ? draggedItem : handler.main
+        var popup = PopupUtils.open(component, anchor, {
+            "target": handler.main,
+        });
+        // hide the arrow
+        popup.__foreground.direction = "none";
+        cursorItem.Component.onDestruction.connect(popup.__closePopup);
         contextMenuVisible = true;
         popup.onVisibleChanged.connect(contextMenuHidden.bind(undefined, popup));
         // do not grab focus!
@@ -116,28 +124,14 @@
         handler.popover = popup;
     }
 
-    visible: handler.main.cursorVisible
-    // change opacity to 0 if text is selected and the positionProperty is cursorPosition
-    // note: we should not touch visibility as cursorVisible alters that!
-    opacity: (positionProperty === "cursorPosition") && (handler.main.selectedText !== "") ? 0.0 : 1.0
+    visible: handler.main.cursorVisible &&
+     !(positionProperty === "cursorPosition" && handler.main.selectedText !== "")
 
     // cursor visual loader
     Loader {
         id: cursorLoader
         sourceComponent: cursorDelegate
         height: parent.height
-        onItemChanged: {
-            if (item) {
-                cursorItem.width = item.width;
-            }
-        }
-        // bind the cursor height as it may change depending on the text size
-        Binding {
-            target: cursorLoader.item
-            property: "height"
-            value: cursorLoader.height
-            when: cursorLoader.item
-        }
     }
 
     /*
@@ -159,18 +153,14 @@
         contextMenuVisible = false
     }
 
-    onXChanged: if (!draggedItemMouseArea.pressed) draggedItem.moveToCaret()
-    onYChanged: if (!draggedItemMouseArea.pressed) draggedItem.moveToCaret()
-    Component.onCompleted: draggedItem.moveToCaret()
-
     //dragged item
-    Item {
-        id: draggedItem
+    property Item draggedItem: Item {
         objectName: cursorItem.positionProperty + "_draggeditem"
-        width: caret ? units.gu(4) : 0
-        height: caret ? cursorItem.height : 0
-        parent: handler.main
-        visible: cursorItem.visible && (cursorItem.opacity > 0.0) && QuickUtils.touchScreenAvailable
+        width: caret.width + units.gu(4)
+        onWidthChanged: draggedItem.moveToCaret()
+        height: caret.height + units.gu(4)
+        parent: fakeCursor.parent
+        visible: caret.visible
 
         /*
           Mouse area to turn on dragging or selection mode when pressed
@@ -197,23 +187,33 @@
                 handler.pressAndHold(-1);
             }
             Ubuntu.Mouse.onDoubleClicked: handler.main.selectWord()
-            Ubuntu.Mouse.clickAndHoldThreshold: units.gu(2)
             Ubuntu.Mouse.enabled: enabled
+
+            // Visible touch target area for debugging purposes
+            Rectangle {
+                anchors.fill: parent
+                color: 'red'
+                opacity: 0.1
+                visible: false // draggedItemMouseArea.enabled
+            }
         }
 
         // aligns the draggedItem to the caret and resets the dragger
         function moveToCaret() {
-            draggedItem.x = mappedCursorPosition("x") - draggedItem.width / 2;
-            draggedItem.y = mappedCursorPosition("y");
+            if (!caret) {
+                return;
+            }
+            draggedItem.x = fakeCursor.x - draggedItem.width / 2;
+            draggedItem.y = fakeCursor.y + caret.y - caret.height / 2;
         }
-        // positions caret to the dragged posinotion
+        // positions caret to the dragged position
         function positionCaret() {
             if (dragger.dragActive) {
                 var dx = dragger.dragStartX + dragger.dragAmountX + handler.flickable.contentX;
                 var dy = dragger.dragStartY + dragger.dragAmountY + handler.flickable.contentY;
-                // consider only the x-distance because of the overlays
                 dx -= handler.frameDistance.x;
                 dy -= handler.frameDistance.y;
+                dy -= draggedItem.height / 2;
                 handler.positionCaret(positionProperty, dx, dy);
             }
         }
@@ -224,7 +224,7 @@
         // fill the entire component area
         parent: handler.main
         anchors.fill: parent
-        enabled: draggedItemMouseArea.enabled && draggedItemMouseArea.pressed && QuickUtils.touchScreenAvailable
+        enabled: draggedItemMouseArea.enabled && draggedItemMouseArea.pressed && caret.visible
         onEnabledChanged: {
             if (enabled) {
                 dragAmountX = 0;
@@ -292,14 +292,16 @@
     // fake cursor, caret is reparented to it to avoid caret clipping
     Item {
         id: fakeCursor
-        parent: handler.main
+        objectName: positionProperty + "FakeCursor"
+        parent: QuickUtils.rootItem(handler.main)
         width: cursorItem.width
         height: cursorItem.height
-        //reparent caret to it
-        Component.onCompleted: if (caret) caret.parent = fakeCursor
+        Component.onCompleted: caret.parent = fakeCursor
 
         x: mappedCursorPosition("x")
         y: mappedCursorPosition("y")
+        onXChanged: draggedItem.moveToCaret()
+        onYChanged: draggedItem.moveToCaret()
 
         // manual clipping: the caret should be visible only while the cursor's
         // top/bottom falls into the text area
@@ -307,8 +309,9 @@
             if (!caret || !cursorItem.visible || cursorItem.opacity < 1.0)
                 return false;
 
-            var leftTop = Qt.point(x - handler.frameDistance.x, y + handler.frameDistance.y + handler.lineSpacing);
-            var rightBottom = Qt.point(x - handler.frameDistance.x, y + height - handler.frameDistance.y - handler.lineSpacing);
+            var pos = handler.main.mapFromItem(fakeCursor.parent, fakeCursor.x, fakeCursor.y);
+            var leftTop = Qt.point(pos.x - handler.frameDistance.x, pos.y + handler.frameDistance.y + handler.lineSpacing);
+            var rightBottom = Qt.point(pos.x - handler.frameDistance.x, pos.y + height - handler.frameDistance.y - handler.lineSpacing);
             return (handler.visibleArea.contains(leftTop) || handler.visibleArea.contains(rightBottom));
         }
     }

=== modified file 'modules/Ubuntu/Components/TextField.qml'
--- modules/Ubuntu/Components/TextField.qml	2014-11-12 03:51:45 +0000
+++ modules/Ubuntu/Components/TextField.qml	2015-03-02 12:00:38 +0000
@@ -846,9 +846,7 @@
     QtObject {
         id: internal
         // array of borders in left, top, right, bottom order
-        property real spacing: control.__styleInstance.overlaySpacing
-        property real lineSpacing: units.dp(3)
-        property real lineSize: editor.font.pixelSize + lineSpacing
+        property real spacing: control.__styleInstance.frameSpacing
 
         property int type: action ? action.parameterType : Ubuntu.Action.None
         onTypeChanged: {
@@ -873,6 +871,8 @@
         // the left pane width depends on its children width
         height: parent.height
         width: childrenRect.width
+        // Overlay needs to have priority
+        z: 1
         onChildrenChanged: {
             // reparenting
             for (var i = 0; i < children.length; i++) {
@@ -893,6 +893,8 @@
         // the right pane width depends on its children width
         height: parent.height
         width: childrenRect.width
+        // Overlay needs to have priority
+        z: 1
         onChildrenChanged: {
             // reparenting
             for (var i = 0; i < children.length; i++) {
@@ -1010,12 +1012,6 @@
                 main: control
                 input: editor
                 flickable: flicker
-                /*
-                  In x direction we use the Flickable x position as we can have overlays
-                  which can shift the cursor caret. On y direction we only use the topMargin
-                  spacing.
-                  */
-                frameDistance: Qt.point(flicker.x, flicker.topMargin)
             }
         }
     }

=== modified file 'modules/Ubuntu/Components/TextInputPopover.qml'
--- modules/Ubuntu/Components/TextInputPopover.qml	2014-11-12 03:51:45 +0000
+++ modules/Ubuntu/Components/TextInputPopover.qml	2015-03-02 12:00:38 +0000
@@ -69,11 +69,14 @@
     }
 
     autoClose: false
-    contentHeight: row.childrenRect.height
-    contentWidth: row.childrenRect.width
+    contentHeight: row.childrenRect.height + padding * 2
+    contentWidth: row.childrenRect.width + padding * 2
+    property int padding: units.gu(1)
     Row {
         id: row
         height: units.gu(6)
+        x: popover.padding
+        y: popover.padding
 
         Repeater {
             model: actions.length
@@ -85,7 +88,7 @@
                   accessible. https://bugs.launchpad.net/autopilot/+bug/1334599
                   */
                 property string text: action.text
-                width: Math.max(units.gu(4), implicitWidth) + units.gu(2)
+                width: Math.max(units.gu(5), implicitWidth) + units.gu(2)
                 height: units.gu(6)
                 action: actions[modelData]
                 style: Theme.createStyleComponent("ToolbarButtonStyle.qml", button)

=== removed file 'modules/Ubuntu/Components/Themes/Ambiance/SelectionCursorStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/SelectionCursorStyle.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/SelectionCursorStyle.qml	1970-01-01 00:00:00 +0000
@@ -1,92 +0,0 @@
-/*
- * Copyright 2012 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import Ubuntu.Components 1.1
-
-EditorCursorStyle {
-    id: cursor
-
-    blinking: false
-    property bool startPin: (styledItem.positionProperty === "selectionStart")
-    property int cursorPosition: styledItem.editorItem[styledItem.positionProperty]
-
-    visible: true
-
-    function updatePosition(pos)
-    {
-        if (undefined === pos)
-            return;
-        var rect = styledItem.editorItem.positionToRectangle(pos);
-        x = rect.x;
-        y = rect.y;
-    }
-    onCursorPositionChanged: updatePosition(cursorPosition)
-
-    Rectangle {
-        id: pinBall
-        width: cursor.pinSize
-        height: width
-        radius: width
-        smooth: true
-        color: cursor.pinColor
-        anchors {
-            horizontalCenter: cursor.horizontalCenter
-            bottom: startPin ? cursor.top : undefined
-            top: !startPin ? cursor.bottom : undefined
-        }
-
-        MouseArea {
-            id: dragArea
-            anchors.fill: parent
-            anchors.margins: -cursor.pinSensingOffset
-
-            drag {
-                target: Item{}
-                axis: Drag.XandYAxis
-                onActiveChanged: {
-                    if (drag.active) {
-                        cursorStartX = cursor.x
-                        cursorStartY = cursor.y
-                        dragStartX = dragArea.drag.target.x
-                        dragStartY = dragArea.drag.target.y
-                    }
-                }
-            }
-
-            property real dragStartX
-            property real dragStartY
-            property real cursorStartX
-            property real cursorStartY
-            property real dragDX: dragArea.drag.target.x - dragArea.dragStartX
-            property real dragDY: dragArea.drag.target.y - dragArea.dragStartY
-
-            onDragDXChanged: updateEditorCursorPosition()
-            onDragDYChanged: updateEditorCursorPosition()
-
-            function updateEditorCursorPosition()
-            {
-                var pos = styledItem.editorItem.mapFromItem(styledItem, cursor.x, cursor.y + cursor.height / 2);
-                var dx = dragArea.cursorStartX + dragDX;
-                var dy = dragArea.cursorStartY + dragDY;
-                if (startPin)
-                    styledItem.editorItem.select(styledItem.editorItem.positionAt(dx, dy), styledItem.editorItem.selectionEnd);
-                else
-                    styledItem.editorItem.select(styledItem.editorItem.selectionStart, styledItem.editorItem.positionAt(dx, dy));
-            }
-        }
-    }
-}

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml	2014-10-08 17:32:09 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml	2015-03-02 12:00:38 +0000
@@ -36,16 +36,8 @@
       Spacing between the frame and the text editor area
       */
     property real frameSpacing: units.gu(1)
-    property real overlaySpacing: frameSpacing / 2
-
-    /*!
-      The following properties define the name of the style components declaring
-      the styles for the main and the selection cursors. All cursors must defive
-      from TextCursorStyle.
-      */
-    property string mainCursorStyle: "TextCursorStyle.qml"
-    property string selectionStartCursorStyle: "TextCursorStyle.qml"
-    property string selectionEndCursorStyle: "TextCursorStyle.qml"
+    // Obsolete
+    property alias overlaySpacing: visuals.frameSpacing
 
     // style body
     anchors.fill: parent

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/TextCursorStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/TextCursorStyle.qml	2014-11-12 03:51:45 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/TextCursorStyle.qml	2015-03-02 12:00:38 +0000
@@ -57,17 +57,16 @@
             width: cursorWidth
             // FIXME: Extend the palette and use palette values here
             color: UbuntuColors.blue
-            visible: blinkTimer.timerShowCursor || !blinkTimer.running
+            visible: styledItem.positionProperty === "cursorPosition" && (blinkTimer.timerShowCursor || !blinkTimer.running)
             Timer {
                 id: blinkTimer
                 interval: cursorStyle.cursorVisibleTimeout
                 running: (cursorStyle.cursorVisibleTimeout > 0) &&
                          (cursorStyle.cursorHiddenTimeout > 0) &&
                          styledItem.visible &&
-                         !styledItem.readOnly &&
-                         !styledItem.contextMenuVisible &&
-                         styledItem.positionProperty === "cursorPosition"
+                         shouldBlink
                 repeat: true
+                property bool shouldBlink: !styledItem.readOnly && !styledItem.contextMenuVisible
                 property bool timerShowCursor: true
                 onTriggered: {
                     interval = (interval == cursorStyle.cursorVisibleTimeout) ?
@@ -84,13 +83,9 @@
         source: "artwork/caret_noshadow.png"
         objectName: "text_cursor_style_caret_" + styledItem.positionProperty
         anchors {
-            top: styledItem.positionProperty === "selectionStart" ? undefined : parent.bottom
-            bottom: styledItem.positionProperty === "selectionStart" ? parent.top : undefined
+            top: parent.bottom
             horizontalCenter: parent.horizontalCenter
-            horizontalCenterOffset: styledItem.positionProperty === "cursorPosition"
-            ? 0
-            : (LayoutMirroring.enabled ? -1 : 1) * (implicitWidth / 2 - cursorWidth)
+            horizontalCenterOffset: cursorWidth / 2
         }
-        rotation: styledItem.positionProperty === "selectionStart" ? 180 : 0
     }
 }

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/TextFieldStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/TextFieldStyle.qml	2014-04-30 07:10:06 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/TextFieldStyle.qml	2015-03-02 12:00:38 +0000
@@ -18,4 +18,5 @@
 
 TextAreaStyle {
     objectName: "textfield_style"
+    frameSpacing: units.gu(0.5)
 }

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ToolbarButtonStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ToolbarButtonStyle.qml	2014-08-11 12:44:43 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ToolbarButtonStyle.qml	2015-03-02 12:00:38 +0000
@@ -37,9 +37,10 @@
                 top: parent.top
                 horizontalCenter: parent.horizontalCenter
             }
-            width: iconWidth
-            height: iconWidth
+            sourceSize.width: iconWidth
+            sourceSize.height: iconWidth
             source: styledItem.iconSource
+            smooth: true
         }
 
         Label {
@@ -52,7 +53,6 @@
             width: paintedWidth
             text: styledItem.text
             fontSize: "x-small"
-            color: Theme.palette.normal.overlayText
         }
     }
 

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/artwork/[e-mail]'
Binary files modules/Ubuntu/Components/Themes/Ambiance/artwork/[e-mail]	2014-11-07 11:03:45 +0000 and modules/Ubuntu/Components/Themes/Ambiance/artwork/[e-mail]	2015-03-02 12:00:38 +0000 differ
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/qmldir'
--- modules/Ubuntu/Components/Themes/Ambiance/qmldir	2014-08-07 19:24:52 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/qmldir	2015-03-02 12:00:38 +0000
@@ -10,7 +10,6 @@
 OptionSelectorStyle 0.1 OptionSelectorStyle.qml
 PopoverForegroundStyle 0.1 PopoverForegroundStyle.qml
 internal ScrollbarStyle ScrollbarStyle.qml
-internal SelectionCursorStyle SelectionCursorStyle.qml
 internal SheetForegroundStyle SheetForegroundStyle.qml
 internal SliderStyle SliderStyle.qml
 internal SwitchStyle SwitchStyle.qml
@@ -48,6 +47,4 @@
 PageHeadStyle 1.1 PageHeadStyle.qml
 Palette 1.1 Palette.qml
 
-internal TextSelectionStartCursorStyle TextSelectionStartCursorStyle.qml
-internal TextSelectionEndCursorStyle TextSelectionEndCursorStyle.qml
 internal OverflowPanel OverflowPanel.qml

=== modified file 'modules/Ubuntu/Components/plugin/quickutils.cpp'
--- modules/Ubuntu/Components/plugin/quickutils.cpp	2014-08-12 10:58:30 +0000
+++ modules/Ubuntu/Components/plugin/quickutils.cpp	2015-03-02 12:00:38 +0000
@@ -35,6 +35,7 @@
     m_rootView(0)
 {
     QGuiApplication::instance()->installEventFilter(this);
+    m_omitIM << "ibus" << "none" << "compose";
 }
 
 /*!
@@ -107,7 +108,9 @@
 
 QString QuickUtils::inputMethodProvider() const
 {
-    return QString(getenv("QT_IM_MODULE"));
+    QString im(getenv("QT_IM_MODULE"));
+
+    return m_omitIM.contains(im) ? QString() : im;
 }
 
 bool QuickUtils::touchScreenAvailable() const

=== modified file 'modules/Ubuntu/Components/plugin/quickutils.h'
--- modules/Ubuntu/Components/plugin/quickutils.h	2014-06-10 11:47:09 +0000
+++ modules/Ubuntu/Components/plugin/quickutils.h	2015-03-02 12:00:38 +0000
@@ -58,6 +58,7 @@
 private:
     explicit QuickUtils(QObject *parent = 0);
     QPointer<QQuickView> m_rootView;
+    QStringList m_omitIM;
 
     void lookupQuickView();
 };

=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/popups.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/popups.py	2014-08-20 06:45:28 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/popups.py	2015-03-02 12:00:38 +0000
@@ -56,6 +56,7 @@
 
     def _get_button(self, text):
         buttons = self.select_many('AbstractButton')
+        texts = []
         for button in buttons:
             # workaround used in the text input's context menu to access
             # action.text so we can get the proper button by text, action
@@ -63,6 +64,10 @@
             # https://bugs.launchpad.net/autopilot/+bug/1334599
             if button.text == text:
                 return button
+            texts.append(button.text)
+        raise _common.ToolkitException(
+            'Could not find a button with text %s (Available buttons are %s)'
+            % (text, ','.join(texts)))
 
 
 class ActionSelectionPopover(_common.UbuntuUIToolkitCustomProxyObjectBase):

=== added file 'tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.header.qml'
--- tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.header.qml	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.header.qml	2015-03-02 12:00:38 +0000
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+
+MainView {
+    id: root
+    width: units.gu(48)
+    height: units.gu(60)
+    useDeprecatedToolbar: false
+
+    Page {
+        title: "Header"
+        head.contents: TextField {
+            id: searchTextField
+            objectName: "textfield"
+            placeholderText: "Header"
+            inputMethodHints: Qt.ImhNoPredictiveText
+            hasClearButton: false
+
+            text: "Then two bears came out of the woods and mauled forty-two of the youths."
+
+            anchors {
+                fill: parent
+                leftMargin: units.gu(1)
+                topMargin: units.gu(0.5)
+                bottomMargin: units.gu(0.5)
+                rightMargin: units.gu(1)
+            }
+
+            secondaryItem: AbstractButton {
+                height: searchTextField.height
+                width: height
+                enabled: searchTextField.text.length > 0
+                Image {
+                    objectName: "clearIcon"
+                    anchors.fill: parent
+                    anchors.margins: units.gu(.75)
+                    source: "image://theme/clear"
+                    opacity: searchTextField.text.length > 0
+                    visible: opacity > 0
+                    Behavior on opacity {
+                        UbuntuNumberAnimation { duration: UbuntuAnimation.FastDuration }
+                    }
+                }
+            }
+        }
+
+        Column {
+            Label {
+                text: "Above is a text field in the header"
+            }
+        }
+    }
+}

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.py'
--- tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.py	2014-11-12 03:51:45 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.py	2015-03-02 12:00:38 +0000
@@ -36,6 +36,8 @@
         dir_path, 'test_textinput.textarea.qml')
     customfield_qml_file_path = os.path.join(
         dir_path, 'test_textinput.textfield_custom.qml')
+    header_qml_file_path = os.path.join(
+        dir_path, 'test_textinput.header.qml')
 
     scenarios = [
         ('textfield',
@@ -47,6 +49,9 @@
         ('customfield',
             dict(test_qml_file_path=customfield_qml_file_path,
                  objectName='textfield')),
+        ('header',
+            dict(test_qml_file_path=header_qml_file_path,
+                 objectName='textfield')),
     ]
 
     def get_command_line(self, command_line):
@@ -59,20 +64,23 @@
             objectName=self.objectName)
         self.assertFalse(self.textfield.focus)
 
+    def select_cursor(self, positionProperty):
+        # The cursor may not receive events right away
+        sleep(1)
+        return self.main_view.select_single(
+            objectName=positionProperty + '_draggeditem')
+
     def test_caret_visible_on_focus(self):
         cursorName = 'text_cursor_style_caret_cursorPosition'
         self._assert_not_visible(objectName=cursorName)
         self.pointing_device.click_object(self.textfield)
         self.assertTrue(self.textfield.focus)
-        cursor = self.main_view.select_single(objectName=cursorName)
-        self.assertTrue(cursor.visible)
+        self.main_view.select_single(objectName=cursorName)
 
     def test_caret_hide_while_typing(self):
         self.pointing_device.click_object(self.textfield)
         self.assertTrue(self.textfield.focus)
-        cursor = self.main_view.select_single(
-            objectName='text_cursor_style_caret_cursorPosition')
-        self.assertTrue(cursor.visible)
+        cursor = self.select_cursor('cursorPosition')
 
         self.textfield.keyboard.type('Lorem ipsum')
         self.assertFalse(cursor.visible)
@@ -80,17 +88,13 @@
     def test_caret_visible_after_tapping(self):
         self.test_caret_hide_while_typing()
         self.pointing_device.click_object(self.textfield)
-        cursor = self.main_view.select_single(
-            objectName='text_cursor_style_caret_cursorPosition')
-        self.assertTrue(cursor.visible)
+        self.select_cursor('cursorPosition')
 
     def test_caret_visible_after_selecting(self):
         self.test_caret_hide_while_typing()
         # Select a character
         self.keyboard.press_and_release('Shift+Left')
-        cursor = self.main_view.select_single(
-            objectName='text_cursor_style_caret_selectionEnd')
-        self.assertTrue(cursor.visible)
+        self.select_cursor('selectionEnd')
 
 
 class InsertModeTextInputTestCase(tests.QMLFileAppTestCase):
@@ -137,44 +141,58 @@
         # Discard popover by tap
         self.pointing_device.move(
             self.textfield.globalRect.x + self.textfield.width * 0.7,
-            self.textfield.globalRect.y + self.textfield.height / 10)
+            self.textfield.globalRect.y + self.textfield.height * 0.9)
         self.pointing_device.click()
 
         self._assert_not_visible(objectName='text_input_contextmenu')
 
-    @testtools.skipIf(platform.model() == 'Desktop', 'Touch only')
+    def select_cursor(self, positionProperty):
+        # The cursor may not receive events right away
+        sleep(1)
+        return self.main_view.select_single(
+            objectName=positionProperty + '_draggeditem')
+
+    def test_header_undisturbed_by_text_handlers(self):
+        # Verify that handlers aren't accidentally placed at absolute 0/0
+        self.pointing_device.click_object(self.textfield)
+        # Back will hide when pressed
+        back = self.main_view.select_single(objectName='customBackButton')
+        self.main_view.get_header().click_custom_back_button()
+        self.assertFalse(back.visible)
+
     def test_popover_visible_after_tapping_caret(self):
         # Insert Mode
         self.pointing_device.click_object(self.textfield)
-        sleep(1)
-        cursor = self.main_view.select_single(
-            objectName='text_cursor_style_cursorPosition')
+        cursor = self.select_cursor('cursorPosition')
         self.pointing_device.click_object(cursor)
         self.assert_buttons(['Select All', 'Paste'])
         self.assert_discard_popover()
 
-    @testtools.skipIf(platform.model() == 'Desktop', 'Touch only')
     def test_popover_visible_after_dragging_caret(self):
         # Insert Mode
         self.pointing_device.click_object(self.textfield)
         self.textfield.keyboard.type('Lorem ipsum')
-        cursor = self.main_view.select_single(
-            objectName='text_cursor_style_cursorPosition')
+        self.pointing_device.click_object(self.textfield)
+        cursor = self.select_cursor('cursorPosition')
         x, y = get_center_point(cursor)
         self.pointing_device.drag(x, y, 0, y)
         self.assert_buttons(['Select All', 'Paste'])
         self.assert_discard_popover()
 
     @testtools.skipIf(platform.model() == 'Desktop', 'Touch only')
-    def test_popover_visible_after_selecting(self):
+    def test_popover_visible_after_long_press(self):
         # Select Mode
         self.pointing_device.click_object(self.textfield)
         self.textfield.keyboard.type('Lorem ipsum')
         self.pointing_device.move(
-            self.textfield.globalRect.x + self.textfield.width / 8,
-            self.textfield.globalRect.y + self.textfield.height / 2)
+            self.textfield.globalRect.x + self.textfield.width // 8,
+            self.textfield.globalRect.y + self.textfield.height // 2)
         # Long press to select a word
-        self.pointing_device.click()
-        self.pointing_device.click()
+        # FIXME: input.Mouse doesn't support long press
+        # press_duration doesn't work here
+        # self.pointing_device.click(press_duration=2.0)
+        self.pointing_device.press()
+        sleep(2)
+        self.pointing_device.release()
         self.assert_buttons(['Cut', 'Copy', 'Paste'])
         self.assert_discard_popover()

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.textarea.qml'
--- tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.textarea.qml	2014-09-17 15:11:08 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.textarea.qml	2015-03-02 12:00:38 +0000
@@ -20,14 +20,23 @@
 MainView {
     width: units.gu(48)
     height: units.gu(60)
+    useDeprecatedToolbar: false
 
     Page {
         title: "Textarea"
+        tools: ToolbarItems {
+            back: ToolbarButton {
+                action: Action {
+                    iconName: "back"
+                    text: i18n.tr("Back")
+                    onTriggered: visible = false
+                }
+            }
+        }
 
         Column {
             TextArea {
                 objectName: "textarea"
-                text: "Lorem ipsum dolor sit amet."
                 width: units.gu(25)
                 height: units.gu(25)
             }

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.textfield.qml'
--- tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.textfield.qml	2014-09-17 15:11:08 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.textfield.qml	2015-03-02 12:00:38 +0000
@@ -20,15 +20,25 @@
 MainView {
     width: units.gu(48)
     height: units.gu(60)
+    useDeprecatedToolbar: false
 
     Page {
         title: "Textfield"
+        tools: ToolbarItems {
+            back: ToolbarButton {
+                action: Action {
+                    iconName: "back"
+                    text: i18n.tr("Back")
+                    onTriggered: visible = false
+                }
+            }
+        }
 
         Column {
             TextField {
                 objectName: "textfield"
                 placeholderText: "Type here"
-                width: units.gu(15)
+                width: units.gu(35)
             }
         }
     }

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.textfield_custom.qml'
--- tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.textfield_custom.qml	2014-09-17 15:11:08 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.textfield_custom.qml	2015-03-02 12:00:38 +0000
@@ -21,21 +21,56 @@
 MainView {
     width: units.gu(48)
     height: units.gu(60)
+    useDeprecatedToolbar: false
 
     Page {
         title: "Textfield"
-
-        Column {
-            TextField {
-                objectName: "textfield"
-                placeholderText: "Type here"
-                width: units.gu(15)
-
-                style: TextFieldStyle {
-                    overlaySpacing: 0
-                    frameSpacing: 0
-                    background: Item {}
-                    color: UbuntuColors.lightAubergine
+        tools: ToolbarItems {
+            back: ToolbarButton {
+                action: Action {
+                    iconName: "back"
+                    text: i18n.tr("Back")
+                    onTriggered: visible = false
+                }
+            }
+        }
+
+        Flickable {
+            anchors.fill: parent
+            contentHeight: childrenRect.height
+
+            Column {
+                anchors.fill: parent
+
+                Label {
+                    text: "Below is a customized text field with clipping"
+                }
+
+                Item {
+                    clip: true // Mustn't affect handler visibility
+                    width: childrenRect.width
+                    height: childrenRect.height
+
+                    TextField {
+                        objectName: "textfield"
+                        placeholderText: "Type here"
+                        width: units.gu(35)
+                        height: units.gu(2)
+
+                        style: TextFieldStyle {
+                            overlaySpacing: 0
+                            frameSpacing: 0
+                            background: Item {}
+                            color: UbuntuColors.lightAubergine
+                        }
+                    }
+                }
+
+                Repeater {
+                    model: 30
+                    Label {
+                        text: "These labels are here to necessitate scrolling"
+                    }
                 }
             }
         }

=== modified file 'tests/launcher/launcher.cpp'
--- tests/launcher/launcher.cpp	2014-06-16 09:19:23 +0000
+++ tests/launcher/launcher.cpp	2015-03-02 12:00:38 +0000
@@ -53,10 +53,12 @@
     // Oxide and QWebEngine need a shared context
     QScopedPointer<QOpenGLContext> shareContext;
     shareContext.reset(new QOpenGLContext);
-#if QT_VERSION < QT_VERSION_CHECK(5, 3, 0)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
+    qt_gl_set_global_share_context(shareContext.data());
+#elif QT_VERSION >= QT_VERSION_CHECK(5, 3, 0)
+    QOpenGLContextPrivate::setGlobalShareContext(shareContext.data());                                                  
+#else
     QSGContext::setSharedOpenGLContext(shareContext.data());
-#else
-    QOpenGLContextPrivate::setGlobalShareContext(shareContext.data());
 #endif
     QGuiApplication::setApplicationName("UITK Launcher");
     QGuiApplication application(argc, (char**)argv);

=== added directory 'tests/unit/tst_quickutils'
=== added file 'tests/unit/tst_quickutils/tst_quickutils.cpp'
--- tests/unit/tst_quickutils/tst_quickutils.cpp	1970-01-01 00:00:00 +0000
+++ tests/unit/tst_quickutils/tst_quickutils.cpp	2015-03-02 12:00:38 +0000
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "uctestcase.h"
+#include "quickutils.h"
+
+class tst_QuickUtils : public QObject
+{
+    Q_OBJECT
+public:
+    tst_QuickUtils() {}
+
+private:
+    QString imEnvVar;
+
+private Q_SLOTS:
+    void initTestCase()
+    {
+        imEnvVar = qgetenv("QT_IM_MODULE");
+        QuickUtils::instance();
+    }
+    void cleanupTestCase()
+    {
+        qputenv("QT_IM_MODULE", imEnvVar.toLocal8Bit());
+    }
+
+    void test_inputmethod_data()
+    {
+        QTest::addColumn<QByteArray>("envVar");
+
+        QTest::newRow("(empty)") << QByteArray("");
+        QTest::newRow("ibus") << QByteArray("ibus");
+        QTest::newRow("compose") << QByteArray("compose");
+        QTest::newRow("none") << QByteArray("none");
+    }
+    void test_inputmethod()
+    {
+        QFETCH(QByteArray, envVar);
+        qputenv("QT_IM_MODULE", envVar);
+        QVERIFY(QuickUtils::instance().inputMethodProvider().isEmpty());
+    }
+};
+
+QTEST_MAIN(tst_QuickUtils)
+
+#include "tst_quickutils.moc"

=== added file 'tests/unit/tst_quickutils/tst_quickutils.pro'
--- tests/unit/tst_quickutils/tst_quickutils.pro	1970-01-01 00:00:00 +0000
+++ tests/unit/tst_quickutils/tst_quickutils.pro	2015-03-02 12:00:38 +0000
@@ -0,0 +1,2 @@
+include(../test-include.pri)
+SOURCES += tst_quickutils.cpp

=== modified file 'tests/unit/unit.pro'
--- tests/unit/unit.pro	2014-11-26 15:39:39 +0000
+++ tests/unit/unit.pro	2015-03-02 12:00:38 +0000
@@ -23,4 +23,5 @@
     tst_arguments \
     tst_argument \
     tst_alarms \
-    tst_theme
+    tst_theme \
+    tst_quickutils

=== modified file 'tests/unit_x11/tst_components/tst_textinput_touch.qml'
--- tests/unit_x11/tst_components/tst_textinput_touch.qml	2014-11-13 19:43:48 +0000
+++ tests/unit_x11/tst_components/tst_textinput_touch.qml	2015-03-02 12:00:38 +0000
@@ -26,10 +26,22 @@
 
     Column {
         spacing: units.gu(1)
+        Label {
+            text: "Text fields are awesome"
+            width: parent.width
+            height: units.gu(10)
+            verticalAlignment: Text.AlignVCenter
+        }
         TextField {
             id: textField
             text: "This is a single line text input called TextField."
         }
+        Label {
+            text: "Text areas are even more amazing"
+            width: parent.width
+            height: units.gu(5)
+            verticalAlignment: Text.AlignVCenter
+        }
         TextArea {
             id: textArea
             text: "This is a multiline text input component called TextArea. It supports fix size as well as auto-expanding behavior. The content is scrollable only if it exceeds the visible area."
@@ -246,7 +258,9 @@
         }
         function test_drag_cursor_handler(data) {
             data.input.focus = true;
-            var caret = findChild(data.input, "cursorPosition_draggeditem");
+            data.input.cursorPosition = 0;
+            var caret = findChild(data.input, "input_handler").cursorPositionCursor;
+            verify(caret, "Caret \"" + data.cursorName + "\" cannot be found!");
             var cursorPosition = data.input.cursorPosition;
 
             TestExtras.touchDrag(0, caret, centerOf(caret), data.delta);
@@ -258,8 +272,8 @@
             return [
                 {tag: "TextField", input: textField, initialCursorPosition: 0, cursorName: "selectionEnd", delta: guPoint(10, 0)},
                 {tag: "TextArea", input: textArea, initialCursorPosition: 0, cursorName: "selectionEnd", delta: guPoint(10, 5)},
-                {tag: "TextField", input: textField, initialCursorPosition: 48, cursorName: "selectionStart", delta: guPoint(-10, 0)},
-                {tag: "TextArea", input: textArea, initialCursorPosition: 50, cursorName: "selectionStart", delta: guPoint(-20, -5)},
+                {tag: "TextField(end)", input: textField, initialCursorPosition: 48, cursorName: "selectionStart", delta: guPoint(-10, 0)},
+                {tag: "TextArea(end)", input: textArea, initialCursorPosition: 50, cursorName: "selectionStart", delta: guPoint(-20, -5)},
             ];
         }
         function test_select_text_by_dragging_cursor_handler(data) {
@@ -268,9 +282,11 @@
             data.input.selectWord();
             var selectedText = data.input.selectedText;
 
-            var caret = findChild(data.input, data.cursorName + "_draggeditem");
+            var caret = findChild(data.input, "input_handler")[data.cursorName + "Cursor"];
             verify(caret, "Caret \"" + data.cursorName + "\" cannot be found!");
 
+            // The caret may not receive events right away
+            sleep(500)
             TestExtras.touchDrag(0, caret, centerOf(caret), data.delta);
             verify(data.input.selectedText !== "", "Selection cleared!");
             verify(data.input.selectedText != selectedText, "Selection did not change");
@@ -280,8 +296,8 @@
             return [
                 {tag: "TextField", input: textField, withSelectedText: false, from: guPoint(2, 2), delta: guPoint(10, 0)},
                 {tag: "TextArea", input: textArea, withSelectedText: false, from: guPoint(2, 2), delta: guPoint(10, 4)},
-                {tag: "TextField", input: textField, withSelectedText: true, from: guPoint(2, 2), delta: guPoint(10, 0)},
-                {tag: "TextArea", input: textArea, withSelectedText: true, from: guPoint(2, 2), delta: guPoint(10, 4)},
+                {tag: "TextField(selected)", input: textField, withSelectedText: true, from: guPoint(2, 2), delta: guPoint(10, 0)},
+                {tag: "TextArea(selected)", input: textArea, withSelectedText: true, from: guPoint(2, 2), delta: guPoint(10, 4)},
             ];
         }
         function test_z_scroll_when_tap_dragged(data) {