Merge lp:~aacid/unity8/scope_settings_keyboard_scroll into lp:unity8

[Albert Astals Cid]

Make the scope settings list scroll to text visible area

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2005
http://jenkins.qa.ubuntu.com/job/unity8-ci/6487/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4700
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/869
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1199
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/515
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1094
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1095
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/726
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/727
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3793
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4697
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4697/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24334
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/513
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/869
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/869/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24335

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6487/rebuild

review: Needs Fixing (continuous-integration)

[Michael Terry (mterry)]

We talked a while on IRC about some nitpicks I had with the code you moved. But you disagreed and it's code you are merely moving, so I won't press the issue.

 * Did you perform an exploratory manual test run of the code change and any related functionality?
 Yup, works great.

 * Did CI run pass? If not, please explain why.
 No, for unrelated reasons.

 * Did you make sure that the branch does not contain spurious tags?
 Yes

review: Approve

[Michael Terry (mterry)]

Still good.

review: Approve

[Michał Sawicz (saviq)]

/«BUILDDIR»/unity8-8.11+16.04.20151026/qml/Components/ListViewOSKScroller.qml: bad import version in line 17

[lp:~aacid/unity8/scope_settings_keyboard_scroll]

2007. By Albert Astals Cid on 2015-10-26

Move to 2.4

[Albert Astals Cid (aacid)]

> /«BUILDDIR»/unity8-8.11+16.04.20151026/qml/Components/ListViewOSKScroller.qml:
> bad import version in line 17

Done

[lp:~aacid/unity8/scope_settings_keyboard_scroll]

2008. By Albert Astals Cid on 2015-10-27

Merge wide-preview-zoomable-videoplayback

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2008
http://jenkins.qa.ubuntu.com/job/unity8-ci/6565/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4851
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/948/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1277
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/593/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1172
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1173
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/804/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/805/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3906
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4848
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4848/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24606
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/948/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6565/rebuild

review: Needs Fixing (continuous-integration)

=== added file 'qml/Components/ListViewOSKScroller.qml'
--- qml/Components/ListViewOSKScroller.qml	1970-01-01 00:00:00 +0000
+++ qml/Components/ListViewOSKScroller.qml	2015-10-27 11:57:54 +0000
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import "../Components"
+
+Item {
+    id: root
+
+    property ListView list
+
+    Binding {
+        target: list
+        property: "bottomMargin"
+        value: d.bottomMargin
+    }
+
+    function setMakeSureVisibleItem(item) {
+        d.previousVisibleHeight = d.visibleHeight;
+        d.makeSureVisibleItem = item;
+    }
+
+    QtObject {
+        id: d
+        property var makeSureVisibleItem
+        property real previousVisibleHeight: 0
+        readonly property real visibleHeight: list.height - list.bottomMargin
+        readonly property real bottomMargin: Qt.inputMethod.visible ? Qt.inputMethod.keyboardRectangle.height : 0
+
+        onVisibleHeightChanged: {
+            if (makeSureVisibleItem && makeSureVisibleItem.activeFocus && previousVisibleHeight > visibleHeight) {
+                var textAreaPos = makeSureVisibleItem.mapToItem(list, 0, 0);
+                if (textAreaPos.y + makeSureVisibleItem.height > visibleHeight) {
+                    list.contentY += textAreaPos.y + makeSureVisibleItem.height - visibleHeight
+                }
+            }
+            previousVisibleHeight = visibleHeight;
+        }
+    }
+}

=== modified file 'qml/Dash/Previews/Preview.qml'
--- qml/Dash/Previews/Preview.qml	2015-10-27 11:57:54 +0000
+++ qml/Dash/Previews/Preview.qml	2015-10-27 11:57:54 +0000
@@ -16,6 +16,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 1.3
+import "../../Components"
 
 /*! \brief This component constructs the Preview UI.
  *
@@ -72,18 +73,10 @@
                 }
                 width: row.columnWidth
                 spacing: row.spacing
-                bottomMargin: Qt.inputMethod.visible ? Qt.inputMethod.keyboardRectangle.height : 0
-                property var makeSureVisibleItem
-                property real previousVisibleHeight: 0
-                property real visibleHeight: height - bottomMargin
-                onVisibleHeightChanged: {
-                    if (makeSureVisibleItem && makeSureVisibleItem.activeFocus && previousVisibleHeight > visibleHeight) {
-                        var textAreaPos = makeSureVisibleItem.mapToItem(column, 0, 0);
-                        if (textAreaPos.y + makeSureVisibleItem.height > column.visibleHeight) {
-                            column.contentY += textAreaPos.y + makeSureVisibleItem.height - column.visibleHeight
-                        }
-                    }
-                    previousVisibleHeight = visibleHeight;
+
+                ListViewOSKScroller {
+                    id: oskScroller
+                    list: column
                 }
 
                 model: columnModel
@@ -107,10 +100,10 @@
                     onTriggered: {
                         previewModel.triggered(widgetId, actionId, data);
                     }
-                     onMakeSureVisible: {
-                         column.previousVisibleHeight=column.visibleHeight
-                         column.makeSureVisibleItem=item
-                     }
+
+                    onMakeSureVisible: {
+                        oskScroller.setMakeSureVisibleItem(item);
+                    }
 
                     onFocusChanged: if (focus) column.positionViewAtIndex(index, ListView.Contain)
 

=== modified file 'qml/Dash/ScopeSettings/ScopeSetting.qml'
--- qml/Dash/ScopeSettings/ScopeSetting.qml	2015-10-27 11:57:54 +0000
+++ qml/Dash/ScopeSettings/ScopeSetting.qml	2015-10-27 11:57:54 +0000
@@ -32,6 +32,15 @@
      */
     signal updated(var value)
 
+    /*! \brief This signal should be emitted when widget gains the focus
+     *  and input method popups.
+     *  And preview widget should reposition in visible area to avoid
+     *  keyboard appears over the widget.
+     *
+     *  \param item, id of specified item which is needed to reposition.
+     */
+    signal makeSureVisible(var item)
+
     //! \internal
     readonly property real settingMargins: units.gu(2)
 }

=== modified file 'qml/Dash/ScopeSettings/ScopeSettingString.qml'
--- qml/Dash/ScopeSettings/ScopeSettingString.qml	2015-10-27 11:57:54 +0000
+++ qml/Dash/ScopeSettings/ScopeSettingString.qml	2015-10-27 11:57:54 +0000
@@ -78,6 +78,12 @@
                     updateText();
                 }
             }
+
+            readonly property bool inputMethodVisible: Qt.inputMethod.visible
+            onInputMethodVisibleChanged: {
+                if(inputMethodVisible && activeFocus)
+                    root.makeSureVisible(control);
+            }
         }
     }
 }

=== modified file 'qml/Dash/ScopeSettings/ScopeSettingsWidgetFactory.qml'
--- qml/Dash/ScopeSettings/ScopeSettingsWidgetFactory.qml	2014-08-26 12:33:32 +0000
+++ qml/Dash/ScopeSettings/ScopeSettingsWidgetFactory.qml	2015-10-27 11:57:54 +0000
@@ -30,6 +30,9 @@
     //! Triggered signal forwarded from the widgets.
     signal updated(var value)
 
+    //! makeSureVisible signal forwarded from the widgets.
+    signal makeSureVisible(var item)
+
     source: widgetSource
 
     //! \cond private
@@ -53,5 +56,6 @@
     Connections {
         target: root.item
         onUpdated: if (value !== widgetData.value) root.updated(value)
+        onMakeSureVisible: root.makeSureVisible(item)
     }
 }

=== modified file 'qml/Dash/ScopeSettingsPage.qml'
--- qml/Dash/ScopeSettingsPage.qml	2015-10-27 11:57:54 +0000
+++ qml/Dash/ScopeSettingsPage.qml	2015-10-27 11:57:54 +0000
@@ -51,6 +51,11 @@
         model: root.scope ? root.scope.settings : null
         clip: true
 
+        ListViewOSKScroller {
+            id: oskScroller
+            list: scopeSettings
+        }
+
         delegate: ScopeSettingsWidgetFactory {
             objectName: "scopeSettingItem" + index
             width: root.width
@@ -58,6 +63,10 @@
             scopeStyle: root.scopeStyle
 
             onUpdated: model.value = value;
+
+            onMakeSureVisible: { // var item
+                oskScroller.setMakeSureVisibleItem(item);
+            }
         }
     }
 }