Merge lp:~canonical-dx-team/unity/unity.fix-click-event into lp:unity

[Jay Taoko]

Fix click event on menu item

[Jason Smith (jassmith)]

+1

review: Approve

=== modified file 'src/QuicklistMenuItem.cpp'
--- src/QuicklistMenuItem.cpp	2010-11-30 05:05:08 +0000
+++ src/QuicklistMenuItem.cpp	2010-11-30 06:34:58 +0000
@@ -308,10 +308,9 @@
 {
   if (!GetEnabled ())
   {
-    sigMouseClick.emit (this);
     return;
   }
-  sigMouseClick.emit (this);
+  sigMouseClick.emit (this, x, y);
 }
 
 void QuicklistMenuItem::RecvMouseMove (int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags)
 
=== modified file 'src/QuicklistMenuItem.h'
--- src/QuicklistMenuItem.h	2010-11-30 05:05:08 +0000
+++ src/QuicklistMenuItem.h	2010-11-30 06:34:58 +0000
@@ -110,7 +110,7 @@
     sigc::signal<void, QuicklistMenuItem*> sigMouseEnter;
     sigc::signal<void, QuicklistMenuItem*> sigMouseLeave;
     sigc::signal<void, QuicklistMenuItem*, int, int> sigMouseReleased;
-    sigc::signal<void, QuicklistMenuItem*> sigMouseClick;
+    sigc::signal<void, QuicklistMenuItem*, int, int> sigMouseClick;
     sigc::signal<void, QuicklistMenuItem*, int, int> sigMouseDrag;
     
     DbusmenuMenuitem* _menuItem;
 
=== modified file 'src/QuicklistView.cpp'
--- src/QuicklistView.cpp	2010-11-30 05:05:08 +0000
+++ src/QuicklistView.cpp	2010-11-30 06:34:58 +0000
@@ -438,11 +438,14 @@
   NeedRedraw ();
 }
 
-void QuicklistView::RecvItemMouseClick (QuicklistMenuItem* item)
+void QuicklistView::RecvItemMouseClick (QuicklistMenuItem* item, int x, int y)
 {
   _mouse_down = false;
   if (IsVisible ())
   {
+    // Check if the mouse was released over an item and emit the signal
+    CheckAndEmitItemSignal (x + item->GetBaseX (), y + item->GetBaseY ());
+
     CancelItemsPrelightStatus ();
     CaptureMouseDownAnyWhereElse (false);
     ForceStopFocus (1, 1);
@@ -453,7 +456,7 @@
 }
 
 void QuicklistView::CheckAndEmitItemSignal (int x, int y)
-{
+{ 
   nux::Geometry geo;
   std::list<QuicklistMenuItem*>::iterator it;
   for (it = _item_list.begin(); it != _item_list.end(); it++)
 
=== modified file 'src/QuicklistView.h'
--- src/QuicklistView.h	2010-11-30 05:05:08 +0000
+++ src/QuicklistView.h	2010-11-30 06:34:58 +0000
@@ -89,7 +89,7 @@
 private:
   void RecvCairoTextChanged (QuicklistMenuItem* item);
   void RecvCairoTextColorChanged (QuicklistMenuItem* item);
-  void RecvItemMouseClick (QuicklistMenuItem* item);
+  void RecvItemMouseClick (QuicklistMenuItem* item, int x, int y);
   void RecvItemMouseRelease (QuicklistMenuItem* item, int x, int y);
   void RecvItemMouseEnter (QuicklistMenuItem* item);
   void RecvItemMouseLeave (QuicklistMenuItem* item);