Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/inputFlickableContentWidth into lp:ubuntu-ui-toolkit/staging

[Cris Dywan]

InputHandler.ensureVisible needs to take flickable contentWidth into account

InputHandler.ensureVisible needs to take flickable contentWidth into account

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1695
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2432/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1160
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1162
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1162/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1159

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2432/rebuild

review: Needs Fixing (continuous-integration)

[Cris Dywan (kalikiana)]

Validation of the state of this MR:

r1694 slightly improves the problem but effectively hides the handlers and moves them offscreen. It can suffer from a binding race where handlers move offscreen in a non-recoverable way.
r1695 removes the Flickable - in theory it simplifies and improves scrolling, in practise it still suffers from the same binding race.
^^ For reference the diff suffers less visibly from the binding race, but it also doesn't improve much on the bug, and the handlers remain largely offscreen as before.

Unmerged revisions

1695. By Cris Dywan on 2015-10-28

Scrollable TextField without Flickable

1694. By Cris Dywan on 2015-10-21

InputHandler.ensureVisible needs to take flickable contentWidth into account

=== modified file 'examples/ubuntu-ui-toolkit-gallery/TextInputs.qml'
--- examples/ubuntu-ui-toolkit-gallery/TextInputs.qml	2015-04-25 08:18:45 +0000
+++ examples/ubuntu-ui-toolkit-gallery/TextInputs.qml	2015-10-28 17:48:25 +0000
@@ -87,6 +87,18 @@
         }
 
         TemplateRow {
+            title: i18n.tr("Website")
+
+            TextField {
+                objectName: "textfield_url"
+                text: 'http://max-skizzen-blog.blogspot.de/2009/10/hessen-eine-geschichte-von-robert.html?m=1'
+                width: parent.width
+                horizontalAlignment: TextInput.AlignHCenter
+                inputMethodHints: Qt.ImhUrlCharactersOnly
+            }
+        }
+
+        TemplateRow {
             title: i18n.tr("Disabled")
 
             TextField {

=== modified file 'src/Ubuntu/Components/1.3/InputHandler.qml'
--- src/Ubuntu/Components/1.3/InputHandler.qml	2015-08-11 17:15:59 +0000
+++ src/Ubuntu/Components/1.3/InputHandler.qml	2015-10-28 17:48:25 +0000
@@ -31,12 +31,13 @@
     // the input instance
     property Item input
     // the Flickable holding the input instance
-    property Flickable flickable
+    property var flickable
 
     // item filling the visible text input area used to check handler visibility
     property Item visibleArea: Item {
         parent: flickable
         anchors.fill: parent
+        anchors.margins: -flickable.margins
     }
 
     // line size and spacing
@@ -81,8 +82,8 @@
     readonly property bool scrollingDisabled: main && main.hasOwnProperty("autoSize") ?
                                                   (main.autoSize && (main.maximumLineCount <= 0)) : false
     onScrollingDisabledChanged: if (state == "") flickable.interactive = !scrollingDisabled
-    readonly property Flickable grandScroller: firstFlickableParent(main)
-    readonly property Flickable scroller: (scrollingDisabled && grandScroller) ? grandScroller : flickable
+    readonly property var grandScroller: firstFlickableParent(main)
+    readonly property var scroller: (scrollingDisabled && grandScroller) ? grandScroller : flickable
 
     // ensures the text cursorRectangle is always in the internal Flickable's visible area
     function ensureVisible(rect)
@@ -91,8 +92,8 @@
             return;
         if (flickable.contentX >= rect.x)
             flickable.contentX = rect.x;
-        else if (flickable.contentX + flickable.width <= rect.x + rect.width)
-            flickable.contentX = rect.x + rect.width - flickable.width;
+        else if (flickable.contentX + flickable.contentWidth <= rect.x + rect.width)
+            flickable.contentX = rect.x + rect.width - flickable.contentWidth;
         if (flickable.contentY >= rect.y)
             flickable.contentY = rect.y;
         else if (flickable.contentY + flickable.height <= rect.y + rect.height)

=== modified file 'src/Ubuntu/Components/1.3/TextField.qml'
--- src/Ubuntu/Components/1.3/TextField.qml	2015-09-28 14:36:54 +0000
+++ src/Ubuntu/Components/1.3/TextField.qml	2015-10-28 17:48:25 +0000
@@ -950,61 +950,55 @@
 
 
     // text input
-    Flickable {
-        id: flicker
-        objectName: "input_scroller"
-        anchors {
-            left: leftPane.right
-            right: clearButton.left
-            top: parent.top
-            bottom: parent.bottom
-            margins: internal.spacing
+    TextInput {
+        id: editor
+        objectName: "text_input"
+        // FocusScope will forward focus to this component
+        focus: true
+        verticalAlignment: TextInput.AlignVCenter
+        cursorDelegate: TextCursor {
+            handler: inputHandler
         }
-        topMargin: internal.spacing
-        // do not allow rebounding
-        boundsBehavior: Flickable.StopAtBounds
-        // need to forward events as events occurred on topMargin area are not grabbed by the MouseArea.
-        Ubuntu.Mouse.forwardTo: [inputHandler]
+        color: control.__styleInstance.color
+        selectedTextColor: control.__styleInstance.selectedTextColor
+        selectionColor: control.__styleInstance.selectionColor
+        font.pixelSize: FontUtils.sizeToPixels("medium")
+        passwordCharacter: "\u2022"
+        // forward keys to the root element so it can be captured outside of it
+        // as well as to InputHandler to handle PageUp/PageDown keys
+        Keys.forwardTo: [control, inputHandler]
+
+        // overrides
+        selectByMouse: true
+        activeFocusOnPress: control.activeFocusOnPress
+        onActiveFocusChanged: if (!activeFocus && inputHandler.popover) PopupUtils.close(inputHandler.popover)
+        // Implement fake Flickable interface for InputHandler
+        property real contentX: x
+        property real contentY: y
+        property bool moving: false
+        property bool flicking: false
+        property bool interactive: autoScroll
+        signal flickStarted()
+        signal movementStarted()
+        signal movementEnded()
 
         clip: true
-        contentWidth: editor.contentWidth
-        contentHeight: editor.contentHeight
-
-        TextInput {
-            id: editor
-            objectName: "text_input"
-            // FocusScope will forward focus to this component
-            focus: true
-            anchors.verticalCenter: parent.verticalCenter
-            verticalAlignment: TextInput.AlignVCenter
-            width: flicker.width
-            height: flicker.height
-            cursorDelegate: TextCursor {
-                handler: inputHandler
-            }
-            color: control.__styleInstance.color
-            selectedTextColor: control.__styleInstance.selectedTextColor
-            selectionColor: control.__styleInstance.selectionColor
-            font.pixelSize: FontUtils.sizeToPixels("medium")
-            passwordCharacter: "\u2022"
-            // forward keys to the root element so it can be captured outside of it
-            // as well as to InputHandler to handle PageUp/PageDown keys
-            Keys.forwardTo: [control, inputHandler]
-
-            // overrides
-            selectByMouse: true
-            activeFocusOnPress: control.activeFocusOnPress
-            onActiveFocusChanged: if (!activeFocus && inputHandler.popover) PopupUtils.close(inputHandler.popover)
-
-            // input selection and navigation handling
-            Ubuntu.Mouse.forwardTo: [inputHandler]
-            InputHandler {
-                id: inputHandler
-                anchors.fill: parent
-                main: control
-                input: editor
-                flickable: flicker
-            }
+        anchors {
+            left: leftPane.right
+            right: clearButton.left
+            verticalCenter: parent.verticalCenter
+            margins: internal.spacing
+        }
+
+        // input selection and navigation handling
+        Ubuntu.Mouse.forwardTo: [inputHandler]
+        InputHandler {
+            id: inputHandler
+            anchors.fill: parent
+            main: control
+            input: editor
+            flickable: editor
+            frameDistance: Qt.point(control.x, control.y)
         }
     }