Merge lp:~aacid/unity-2d/ShowTileContextMenuOnPress_813036 into lp:unity-2d

[Albert Astals Cid]

[launcher] Move the RMB menu from clicked to pressed

Fixes LP bug #813036

Move the RMB menu from clicked to pressed

Fixes LP bug #813036

[Gerry Boland (gerboland)]

Until we get automated testing going, I need to ask you to write unit test to test this fix, and place them in https://wiki.ubuntu.com/Unity2DRegressionTests

[Albert Astals Cid (aacid)]

> Until we get automated testing going, I need to ask you to write unit test to
> test this fix, and place them in
> https://wiki.ubuntu.com/Unity2DRegressionTests

Text added to https://wiki.ubuntu.com/Unity2DRegressionTests

[Lohith D Shivamurthy (dyams)]

Now we have moved to unity-core-5.0. Could you please rebase with trunk and check if you can rebuild successfully?

[lp:~aacid/unity-2d/ShowTileContextMenuOnPress_813036]

791. By Albert Astals Cid on 2011-12-19

* debian/control:
  - bump libunitycore build-dep to 5.0.
    TODO: update to the real dep version when releasing

[Albert Astals Cid (aacid)]

This is a pure QML change, I don't see why changing to unity-core should make any difference

[Florian Boucault (fboucault)]

Agreed with Albert.
What is RMB that I see in the commit/description message? Can we be explicit?

[Albert Astals Cid (aacid)]

RMB = Right Mouse Button

[Lohith D Shivamurthy (dyams)]

> This is a pure QML change, I don't see why changing to unity-core should make
> any difference

Thank you Albert.
In order to avoid merge conflicts later, I asked you to re-base with trunk already.

[Lohith D Shivamurthy (dyams)]

It works good and code is neat and clean.
Approving.

review: Approve

=== modified file 'launcher/LauncherItem.qml'
--- launcher/LauncherItem.qml	2011-12-11 22:26:58 +0000
+++ launcher/LauncherItem.qml	2011-12-19 09:17:31 +0000
@@ -101,6 +101,7 @@
     }
 
     signal clicked(variant mouse)
+    signal pressed(variant mouse)
     signal entered
     signal exited
 
@@ -179,6 +180,7 @@
             onClicked: item.clicked(mouse)
             onEntered: item.entered()
             onExited: item.exited()
+            onPressed: item.pressed(mouse)
         }
 
         /* This is the for centering the actual tile in the launcher */
 
=== modified file 'launcher/LauncherList.qml'
--- launcher/LauncherList.qml	2011-12-15 14:00:48 +0000
+++ launcher/LauncherList.qml	2011-12-19 09:17:31 +0000
@@ -153,19 +153,22 @@
                 item.menu.hide()
                 item.activate()
             }
-            else if (mouse.button == Qt.RightButton) {
-                /* Show the menu first, then unfold it. Doing things in this
-                   order is required because at the moment the code path that
-                   adjusts the position of the menu in case it goes offscreen
-                   is traversed only when unfolding it.
-                   See FIXME in LauncherContextualMenu::show(…). */
-                showMenu()
-                item.menu.folded = false
-            }
             else if (mouse.button == Qt.MidButton) {
                 item.launchNewInstance()
             }
         }
+        
+        onPressed: {
+            if (mouse.button == Qt.RightButton) {
+                /* Show the menu first, then unfold it. Doing things in this
+                   order is required because at the moment the code path that
+                   adjusts the position of the menu in case it goes offscreen
+                   is traversed only when unfolding it.
+                   See FIXME in LauncherContextualMenu::show(…). */
+                showMenu()
+                item.menu.folded = false
+            }
+        }
 
         /* Display the tooltip when hovering the item only when the list
            is not moving */