Merge lp:~dandrader/unity/phablet_fixLauncherTopScroll into lp:unity/phablet

[Daniel d'Andrada]

Launcher: Remove fold() unfold() functions as they're interfering with normal behavior

Launcher's "folding icons"/accordeon behavior was disabled a while ago but its
code is still there. After the replacement of DraggingArea with DirectionalDragArea
it began interfering with normal Launcher behavior. Since this code it not needed
anyway, it's simple to remove it than to make it "not interfere with anything"
once again.

Launcher: Remove fold() unfold() functions as they're interfering with normal behavior

Launcher's "folding icons"/accordeon behavior was disabled a while ago but its code is still there. After the replacement of DraggingArea with DirectionalDragArea it began interfering with normal Launcher behavior. Since this code it not needed anyway, it's simple to remove it than to make it "not interfere with anything" once again.

[Michał Sawicz (saviq)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'Launcher/Launcher.qml'
--- Launcher/Launcher.qml	2013-05-23 19:17:21 +0000
+++ Launcher/Launcher.qml	2013-05-27 15:15:33 +0000
@@ -220,10 +220,6 @@
         function onDragStarted() {
             if (launcher.state == "") launcher.state = "hint"
             dismissTimer.stop()
-
-            if (launcher.state == "shortcuts" && !shortcuts.animating) {
-                shortcuts.unfold()
-            }
         }
 
         onDistanceChanged: {
@@ -269,8 +265,6 @@
 
             shortcuts.stopScroll()
 
-            //unfoldTimer.stop()
-
             if (launcher.state == "shortcuts") {
                 dismissTimer.restart()
             }
@@ -298,16 +292,6 @@
         }
     }
 
-    Timer {
-        id: unfoldTimer
-        interval: 150;
-        running: false;
-        repeat: false
-        onTriggered: {
-            shortcuts.unfold()
-        }
-    }
-
     states: [
         State {
             name: "hint"
@@ -365,7 +349,7 @@
                 }
                 ScriptAction {
                     script: {
-                        shortcuts.fold()
+                        shortcuts.resetScrollPosition()
                     }
                 }
             }
@@ -387,7 +371,6 @@
                         if (priv.previousState == "moving") {
                             priv.shortcutAnimationOngoing = true
                         }
-                        unfoldTimer.start()
                     }
                 }
                 ParallelAnimation {

=== modified file 'Launcher/LauncherShortcuts.qml'
--- Launcher/LauncherShortcuts.qml	2013-05-23 19:17:21 +0000
+++ Launcher/LauncherShortcuts.qml	2013-05-27 15:15:33 +0000
@@ -71,6 +71,10 @@
 
     Component.onCompleted: init()
 
+    function resetScrollPosition() {
+        flickable.contentY = 0
+    }
+
     function init() {
         clearModels()
         addDashIcon()
@@ -125,27 +129,6 @@
         }
     }
 
-    function unfold() {
-        if (!shortcuts.open) {
-            var addvalue = 0
-            if (shortcuts.currentIndex - shortcuts.openModel.count >= 0) {
-                addvalue = -2 * shortcuts.itemHeight / 3 + shortcuts.fillItemHeight
-            }
-            if (shortcuts.currentIndex - shortcuts.openModel.count > 0) {
-                addvalue += -2 * shortcuts.itemHeight / 3 * (shortcuts.currentIndex - shortcuts.openModel.count)
-            }
-
-            shortcutsContainer.targetY += addvalue
-            shortcuts.open = true
-        }
-    }
-
-    function fold() {
-        flickable.contentY = 0
-        shortcutsContainer.targetY = 0
-        shortcuts.open = false
-    }
-
     function scroll() {
         if (!scrolling && shortcutsContainer.height > shortcuts.height) {
             var scrollingAtStart = shortcutsContainer.targetY == 0