Merge lp:~canonical-dx-team/unity/unity.quicklist-event-handling into lp:unity

[Jay Taoko]

Improved mouse event handling. Interpret mouse events on the quicklist and get ready to send the clicked signal.

[Jason Smith (jassmith)]

+1

review: Approve

=== modified file 'src/QuicklistMenuItem.cpp'
--- src/QuicklistMenuItem.cpp	2010-11-29 17:18:55 +0000
+++ src/QuicklistMenuItem.cpp	2010-11-30 05:21:18 +0000
@@ -301,7 +301,7 @@
 
 void QuicklistMenuItem::RecvMouseUp (int x, int y, unsigned long button_flags, unsigned long key_flags)
 {
-  sigMouseReleased.emit (this);
+  sigMouseReleased.emit (this, x, y);
 }
 
 void QuicklistMenuItem::RecvMouseClick (int x, int y, unsigned long button_flags, unsigned long key_flags)
@@ -316,12 +316,12 @@
 
 void QuicklistMenuItem::RecvMouseMove (int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags)
 {
-  
+  //printf ("[QuicklistMenuItem::RecvMouseMove]\n");
 }
 
 void QuicklistMenuItem::RecvMouseDrag (int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags)
 {
-  
+    sigMouseDrag.emit (this, x, y);
 }
 
 void QuicklistMenuItem::RecvMouseEnter (int x, int y, unsigned long button_flags, unsigned long key_flags)

=== modified file 'src/QuicklistMenuItem.h'
--- src/QuicklistMenuItem.h	2010-11-25 13:01:34 +0000
+++ src/QuicklistMenuItem.h	2010-11-30 05:21:18 +0000
@@ -109,8 +109,9 @@
     
     sigc::signal<void, QuicklistMenuItem*> sigMouseEnter;
     sigc::signal<void, QuicklistMenuItem*> sigMouseLeave;
-    sigc::signal<void, QuicklistMenuItem*> sigMouseReleased;
+    sigc::signal<void, QuicklistMenuItem*, int, int> sigMouseReleased;
     sigc::signal<void, QuicklistMenuItem*> sigMouseClick;
+    sigc::signal<void, QuicklistMenuItem*, int, int> sigMouseDrag;
     
     DbusmenuMenuitem* _menuItem;
     QuicklistMenuItemType _item_type;

=== modified file 'src/QuicklistView.cpp'
--- src/QuicklistView.cpp	2010-11-24 18:25:38 +0000
+++ src/QuicklistView.cpp	2010-11-30 05:21:18 +0000
@@ -139,6 +139,7 @@
   item->sigMouseReleased.connect (sigc::mem_fun (this, &QuicklistView::RecvItemMouseRelease));
   item->sigMouseEnter.connect (sigc::mem_fun (this, &QuicklistView::RecvItemMouseEnter));
   item->sigMouseLeave.connect (sigc::mem_fun (this, &QuicklistView::RecvItemMouseLeave));
+  item->sigMouseDrag.connect (sigc::mem_fun (this, &QuicklistView::RecvItemMouseDrag));
   
   _default_item_layout->AddView(item, 1, nux::eCenter, nux::eFull);
   _default_item_list.push_back (item);
@@ -159,6 +160,7 @@
   item->sigMouseReleased.connect (sigc::mem_fun (this, &QuicklistView::RecvItemMouseRelease));
   item->sigMouseEnter.connect (sigc::mem_fun (this, &QuicklistView::RecvItemMouseEnter));
   item->sigMouseLeave.connect (sigc::mem_fun (this, &QuicklistView::RecvItemMouseLeave));
+  item->sigMouseDrag.connect (sigc::mem_fun (this, &QuicklistView::RecvItemMouseDrag));
   
   _default_item_layout->AddView(item, 1, nux::eCenter, nux::eFull);
   _default_item_list.push_back (item);
@@ -214,8 +216,12 @@
   // We choose to test the quicklist items ourselves instead of processing them as it is usual in nux.
   // This is meant to be easier since the quicklist has a atypical way of working.
   if (m_layout)
+  {
     ret = m_layout->ProcessEvent (window_event, ret, ProcEvInfo);
-
+  }
+  
+  // The quicklist itself does not process the evvent. Instead we do some analysis of the event 
+  // to detect the user action and perform the correct operation.
   if (ievent.e_event == nux::NUX_MOUSE_PRESSED)
   {
     if (GetGeometry ().IsPointInside (ievent.e_x, ievent.e_y))
@@ -227,6 +233,7 @@
       _mouse_down = false;
       if (IsVisible ())
       {
+        CancelItemsPrelightStatus ();
         CaptureMouseDownAnyWhereElse (false);
         ForceStopFocus (1, 1);
         UnGrabPointer ();
@@ -238,10 +245,10 @@
   }
   else if ((ievent.e_event == nux::NUX_MOUSE_RELEASED) && _mouse_down)
   {
-    
     _mouse_down = false;
     if (IsVisible ())
     {
+      CancelItemsPrelightStatus ();
       CaptureMouseDownAnyWhereElse (false);
       ForceStopFocus (1, 1);
       UnGrabPointer ();
@@ -251,11 +258,7 @@
     return nux::eMouseEventSolved;
   }
   
-  // PostProcessEvent2 must always have its last parameter set to 0
-  // because the m_BackgroundArea is the real physical limit of the window.
-  // So the previous test about IsPointInside do not prevail over m_BackgroundArea
-  // testing the event by itself.
-  //ret = PostProcessEvent2 (ievent, ret, 0);
+  
   return ret;    
 }
 
@@ -440,6 +443,7 @@
   _mouse_down = false;
   if (IsVisible ())
   {
+    CancelItemsPrelightStatus ();
     CaptureMouseDownAnyWhereElse (false);
     ForceStopFocus (1, 1);
     UnGrabPointer ();
@@ -448,11 +452,44 @@
   }
 }
 
-void QuicklistView::RecvItemMouseRelease (QuicklistMenuItem* item)
+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++)
+  {
+    geo = (*it)->GetGeometry ();
+    geo.width = _item_layout->GetBaseWidth ();
+    
+    if (geo.IsPointInside (x, y))
+    {
+      // An action is performed: send the signal back to the application
+    }
+  }
+
+  for (it = _default_item_list.begin(); it != _default_item_list.end(); it++)
+  {
+    geo = (*it)->GetGeometry ();
+    geo.width = _default_item_layout->GetBaseWidth ();
+    
+    if (geo.IsPointInside (x, y))
+    {
+      // An action is performed: send the signal back to the application
+    }
+  } 
+}
+
+void QuicklistView::RecvItemMouseRelease (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);
     UnGrabPointer ();
@@ -461,6 +498,57 @@
   }  
 }
 
+void QuicklistView::CancelItemsPrelightStatus ()
+{
+  std::list<QuicklistMenuItem*>::iterator it;
+  for (it = _item_list.begin(); it != _item_list.end(); it++)
+  {
+    (*it)->_prelight = false;
+  }
+
+  for (it = _default_item_list.begin(); it != _default_item_list.end(); it++)
+  {
+    (*it)->_prelight = false;
+  }
+}
+
+void QuicklistView::RecvItemMouseDrag (QuicklistMenuItem* item, int x, int y)
+{
+  nux::Geometry geo;
+  std::list<QuicklistMenuItem*>::iterator it;
+  for (it = _item_list.begin(); it != _item_list.end(); it++)
+  {
+    geo = (*it)->GetGeometry ();
+    geo.width = _item_layout->GetBaseWidth ();
+    
+    if (geo.IsPointInside (x + item->GetBaseX (), y + item->GetBaseY ()))
+    {
+      (*it)->_prelight = true;
+    }
+    else
+    {
+      (*it)->_prelight = false;
+    }
+  }
+
+  for (it = _default_item_list.begin(); it != _default_item_list.end(); it++)
+  {
+    geo = (*it)->GetGeometry ();
+    geo.width = _default_item_layout->GetBaseWidth ();
+    
+    if (geo.IsPointInside (x + item->GetBaseX (), y + item->GetBaseY ()))
+    {
+      (*it)->_prelight = true;
+    }
+    else
+    {
+      (*it)->_prelight = false;
+    }
+  }
+  
+  NeedRedraw ();
+}
+
 void QuicklistView::RecvItemMouseEnter (QuicklistMenuItem* item)
 {
   NeedRedraw ();
@@ -485,13 +573,15 @@
 
 void QuicklistView::RecvMouseUp (int x, int y, unsigned long button_flags, unsigned long key_flags)
 {
-  
+    // Check if the mouse was released over an item and emit the signal
+    CheckAndEmitItemSignal (x, y);
 }
 
 void QuicklistView::RecvMouseClick (int x, int y, unsigned long button_flags, unsigned long key_flags)
 {
   if (IsVisible ())
   {
+    CancelItemsPrelightStatus ();
     CaptureMouseDownAnyWhereElse (false);
     ForceStopFocus (1, 1);
     UnGrabPointer ();
@@ -514,6 +604,7 @@
 {
   if (IsVisible ())
   {
+    CancelItemsPrelightStatus ();
     CaptureMouseDownAnyWhereElse (false);
     ForceStopFocus (1, 1);
     UnGrabPointer ();
@@ -544,6 +635,7 @@
   item->sigMouseReleased.connect (sigc::mem_fun (this, &QuicklistView::RecvItemMouseRelease));
   item->sigMouseEnter.connect (sigc::mem_fun (this, &QuicklistView::RecvItemMouseEnter));
   item->sigMouseLeave.connect (sigc::mem_fun (this, &QuicklistView::RecvItemMouseLeave));
+  item->sigMouseDrag.connect (sigc::mem_fun (this, &QuicklistView::RecvItemMouseDrag));
    
   _item_layout->AddView(item, 1, nux::eCenter, nux::eFull);
   _item_list.push_back (item);

=== modified file 'src/QuicklistView.h'
--- src/QuicklistView.h	2010-11-24 00:03:08 +0000
+++ src/QuicklistView.h	2010-11-30 05:21:18 +0000
@@ -81,7 +81,7 @@
   
   int GetNumItems ();
   QuicklistMenuItem* GetNthItems (int index);
-  QuicklistMenuItemType GetNthType  (int index);
+  QuicklistMenuItemType GetNthType (int index);
   std::list<QuicklistMenuItem*> GetChildren ();
   
   void TestMenuItems (DbusmenuMenuitem* root);
@@ -90,10 +90,11 @@
   void RecvCairoTextChanged (QuicklistMenuItem* item);
   void RecvCairoTextColorChanged (QuicklistMenuItem* item);
   void RecvItemMouseClick (QuicklistMenuItem* item);
-  void RecvItemMouseRelease (QuicklistMenuItem* item);
+  void RecvItemMouseRelease (QuicklistMenuItem* item, int x, int y);
   void RecvItemMouseEnter (QuicklistMenuItem* item);
   void RecvItemMouseLeave (QuicklistMenuItem* item);
-  
+  void RecvItemMouseDrag (QuicklistMenuItem* item, int x, int y);
+
   void RecvMouseDown (int x, int y, unsigned long button_flags, unsigned long key_flags);
   void RecvMouseUp (int x, int y, unsigned long button_flags, unsigned long key_flags);
   void RecvMouseClick (int x, int y, unsigned long button_flags, unsigned long key_flags);
@@ -114,6 +115,11 @@
   //! A convenience function to fill in the default quicklist with some random items.
   void FillInDefaultItems ();
   
+  void CancelItemsPrelightStatus ();
+  
+  //! Check the mouse up event sent by an item. Detect the item where the mous is and emit the appropriate signal.
+  void CheckAndEmitItemSignal (int x, int y);
+  
   //nux::CairoGraphics*   _cairo_graphics;
   int                   _anchorX;
   int                   _anchorY;