Merge lp:~marcobiscaro2112/unity/fixes-724045 into lp:unity

[Marco Biscaro]

The first problem was that BamfLauncherIcon::ActivateLauncherIcon was never receiving the scaleWasActive flag because the method that call it (LauncherIcon::Activate) was always terminating scale.

So, I turned LauncherIcon::Activate into virtual and overwrote it in BamfLauncherIcon.

The second problem was that method BamfLauncherIcon::ActivateLauncherIcon was not working as expected. I've rewrite the method following the desired behaviour in its comment. Below there is a pseudo-code of the method.

// Pseudo-code
When a BamfLauncherIcon is clicked:

If the application is not running
  Finish scale, if scale was active
  Launch it
If the application is running
  If the application is active
    If the scale was active
      Terminate scale
    If the scale was not active
      Spread application
  If the application is not active
    If the scale was active
      Change spread
    If the scale was not active
      Focus application
Send a UBUS_LAUNCHER_ACTION_DONE message
// End of pseudo-code

[Andrea Azzarone (azzar1)]

As stated at UDS i will review my first merge proposal.

The code seems code, just two thing.

1) SetLastSpreadIcon (and GetLastSpreadIcon) is deprecated (there is a FIXME in Launcher.cpp). You should completely remove this function both in Launcher.cpp and BamfLauncherIcon.cpp.

2) The «ccsm->scale->bindings->click dekstop to show dekstop» option is unchecked by default, but if we activate this option the scale doesn't work well (it doesn't work either now).

[Marco Biscaro (marcobiscaro2112)]

The first problem is fixed now. I'll need some more time to look to the another one.

[Andrea Azzarone (azzar1)]

+1 for me!

=== modified file 'src/BamfLauncherIcon.cpp'
--- src/BamfLauncherIcon.cpp	2011-06-02 15:14:17 +0000
+++ src/BamfLauncherIcon.cpp	2011-06-09 16:11:21 +0000
@@ -57,6 +57,13 @@
 }
 
 void
+BamfLauncherIcon::Activate ()
+{
+  ActivateLauncherIcon ();
+}
+
+
+void
 BamfLauncherIcon::ActivateLauncherIcon ()
 {
   bool scaleWasActive = PluginAdapter::Default ()->IsScaleActive ();
@@ -77,27 +84,42 @@
   {
     if (GetQuirk (QUIRK_STARTING))
       return;
+
+    if (scaleWasActive)
+    {
+      PluginAdapter::Default ()->TerminateScale ();
+    }
+
     SetQuirk (QUIRK_STARTING, true);
     OpenInstanceLauncherIcon ();
-    return;
-  }
-  else if (scaleWasActive)
-  {
-    if (active ||           // #5 above
-        !Spread (0, false)) // #4 above
-    {
-      PluginAdapter::Default ()->TerminateScale ();
-      Focus ();
-      _launcher->SetLastSpreadIcon (NULL);
-    }
-  }
-  else if (!active) // #3 above
-  {
-    Focus ();
-  }
-  else if (active && !scaleWasActive) // #2 above
-  {
-    Spread (0, false);
+  }
+  else // app is running
+  {
+    if (active)
+    {
+      if (scaleWasActive) // #5 above
+      {
+        PluginAdapter::Default ()->TerminateScale ();
+        Focus ();
+      }
+      else // #2 above
+      {
+        Spread (0, false);
+      }
+    }
+    else
+    {
+      if (scaleWasActive) // #4 above
+      {
+        PluginAdapter::Default ()->TerminateScale ();
+        Focus ();
+        Spread (0, false);
+      }
+      else // #3 above
+      {
+        Focus ();
+      }
+    }
   }
 
   ubus_server_send_message (ubus_server_get_default (), UBUS_LAUNCHER_ACTION_DONE, NULL);
@@ -503,7 +525,6 @@
   if (windowList.size () > 1 || (windowList.size () > 0 && force))
   {
     std::string match = PluginAdapter::Default ()->MatchStringForXids (&windowList);
-    _launcher->SetLastSpreadIcon ((LauncherIcon *) this);
     PluginAdapter::Default ()->InitiateScale (match, state);
     g_list_free (children);
     return true;

=== modified file 'src/BamfLauncherIcon.h'
--- src/BamfLauncherIcon.h	2011-04-07 21:46:48 +0000
+++ src/BamfLauncherIcon.h	2011-06-09 16:11:21 +0000
@@ -43,6 +43,7 @@
     bool IsSticky ();
     void UnStick ();
 
+    virtual void Activate ();
     void ActivateLauncherIcon ();
 
 protected:

=== modified file 'src/Launcher.cpp'
--- src/Launcher.cpp	2011-06-09 12:05:12 +0000
+++ src/Launcher.cpp	2011-06-09 16:11:21 +0000
@@ -308,10 +308,6 @@
     _on_drag_update_connection = (sigc::connection) adapter->drag_update.connect (sigc::mem_fun (this, &Launcher::OnDragUpdate));
     _on_drag_finish_connection = (sigc::connection) adapter->drag_finish.connect (sigc::mem_fun (this, &Launcher::OnDragFinish));
 
-    // FIXME: not used, remove (with Get function) in O
-    m_ActiveMenuIcon = NULL;
-    m_LastSpreadIcon = NULL;
-
     _current_icon       = NULL;
     _current_icon_index = -1;
     _last_icon_index    = -1;
@@ -2299,10 +2295,6 @@
 
     if (icon == _current_icon)
       _current_icon = 0;
-    if (icon == m_ActiveMenuIcon)
-      m_ActiveMenuIcon = 0;
-    if (icon == m_LastSpreadIcon)
-      m_LastSpreadIcon = 0;
     if (icon == _icon_under_mouse)
       _icon_under_mouse = 0;
     if (icon == _icon_mouse_down)

=== modified file 'src/Launcher.h'
--- src/Launcher.h	2011-04-20 03:59:36 +0000
+++ src/Launcher.h	2011-06-09 16:11:21 +0000
@@ -104,10 +104,6 @@
   virtual void DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw);
   virtual void PostDraw(nux::GraphicsEngine& GfxContext, bool force_draw);
 
-  LauncherIcon* GetActiveMenuIcon() {return m_ActiveMenuIcon;}
-  LauncherIcon* GetLastSpreadIcon() {return m_LastSpreadIcon;}
-  void SetLastSpreadIcon(LauncherIcon *i) {m_LastSpreadIcon = i;}
-
   LauncherIcon* GetSelectedMenuIcon ();
 
   void SetIconSize(int tile_size, int icon_size);
@@ -404,8 +400,6 @@
   // used by keyboard/a11y-navigation
   LauncherIcon* _current_icon;
   LauncherIcon* m_ActiveTooltipIcon;
-  LauncherIcon* m_ActiveMenuIcon;
-  LauncherIcon* m_LastSpreadIcon;
   LauncherIcon* _icon_under_mouse;
   LauncherIcon* _icon_mouse_down;
   LauncherIcon* _drag_icon;

=== modified file 'src/LauncherIcon.h'
--- src/LauncherIcon.h	2011-05-27 18:57:49 +0000
+++ src/LauncherIcon.h	2011-06-09 16:11:21 +0000
@@ -103,7 +103,7 @@
     void        SetCenter (nux::Point3 center);
     nux::Point3 GetCenter ();
 
-    void Activate ();
+    virtual void Activate ();
     void OpenInstance ();
 
     void SaveCenter ();