Merge lp:~dyams/unity-2d/super-key-position-launcher into lp:unity-2d

[Lohith D Shivamurthy]

[launcher] Force the launcher to reposition to the beginning when Dash is summoned with Super key

Have the launcher to reposition to the beginning when Dash is summoned with Super key

[Gerry Boland (gerboland)]

Looks great! Please just add test case to https://wiki.ubuntu.com/Unity2DRegressionTests:

- Launcher visible, scrolled down, hit Super. Launcher should hide tooltips/menus, reposition to start.

[Lohith D Shivamurthy (dyams)]

> Looks great! Please just add test case to
> https://wiki.ubuntu.com/Unity2DRegressionTests:
Thank you, the wiki is updated.

>
> - Launcher visible, scrolled down, hit Super. Launcher should hide
> tooltips/menus, reposition to start.
Yes

=== modified file 'launcher/Launcher.qml'
--- launcher/Launcher.qml	2011-11-09 10:30:28 +0000
+++ launcher/Launcher.qml	2011-11-23 12:21:26 +0000
@@ -37,6 +37,11 @@
         }
     }
 
+    function positionAtBeginning() {
+        main.positionViewAtBeginning()
+        hideMenu()
+    }
+
     GnomeBackground {
         Accessible.name: "background"
         anchors.fill: parent

=== modified file 'launcher/app/launcherview.cpp'
--- launcher/app/launcherview.cpp	2011-11-18 10:15:49 +0000
+++ launcher/app/launcherview.cpp	2011-11-23 12:21:26 +0000
@@ -263,6 +263,7 @@
         }
 
         dashInterface.asyncCall(DASH_DBUS_METHOD_ACTIVATE_HOME);
+        positionAtBeginning();
     }
 }
 
@@ -280,3 +281,11 @@
     QGraphicsObject* launcher = rootObject();
     QMetaObject::invokeMethod(launcher, "hideMenu", Qt::AutoConnection);
 }
+
+void
+LauncherView::positionAtBeginning()
+{
+    QGraphicsObject* launcher = rootObject();
+    QMetaObject::invokeMethod(launcher, "positionAtBeginning", Qt::AutoConnection);
+}
+

=== modified file 'launcher/app/launcherview.h'
--- launcher/app/launcherview.h	2011-11-18 10:15:49 +0000
+++ launcher/app/launcherview.h	2011-11-23 12:21:26 +0000
@@ -66,6 +66,9 @@
     void focusOutEvent(QFocusEvent* event);
 
 private:
+    void positionAtBeginning();
+
+private:
     bool m_superKeyPressed;
     bool m_superKeyHeld;
     bool m_superPressIgnored;