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

[Marco Biscaro]

Implementation of what was discussed here: https://bugs.launchpad.net/ayatana-design/+bug/733349/comments/58

This option is disabled by default, and can be enabled through ccsm.

[Mirco Müller (macslow)]

While the code looks ok, compiles and works as advertised, it will not be approved - thus merged into trunk - as long as the design and user-interaction discussion does not agree with this. At least this is something that can be considered to be part of a future user-testing session and see how this behaviour is received compared to the current one.

On a general note... adding numerous options, which divert from the default, causes the introduction of code-paths note exercised as much as others (default) ones. Thus code-rot is a potential danger here... where options could cause unknown/undiscovered side-effects, because they just have not been tested as much.

[Mirco Müller (macslow)]

review: Disapprove

[Marco Biscaro (marcobiscaro2112)]

I understand this point of view, but disagree in this case.

At moment, there are 78 people which manifested as affected by this bug. And I'm sure that are many more. If we add this functionality now, there is a lot of time to people test it before oneiric (and even more time before the next LTS).

Otherwise, if we keep this thought in mind, unity will not evolve: it will not turn better, it will not turn more customizable, it will not turn more familiar. And it's this that users expect. :)

Please, consider this.

[Magnes (magnesus2)]

Where is the "the design and user-interaction discussion" and how can we participate? Why people that are affected by this bug are not part of it? Why are you trowing out ready solution that doesn't break anything and is turned off by default?

[lp:~marcobiscaro2112/unity/fixes-733349]

1189. By Marco Biscaro on 2011-12-20

Reverted changes

1190. By Marco Biscaro on 2011-12-20

Merge with trunk

1191. By Marco Biscaro on 2011-12-20

Implementing minimization when launcher icon is clicked (LP: #733349).

Reference: https://bugs.launchpad.net/ayatana-design/+bug/733349/comments/58

Unmerged revisions

1191. By Marco Biscaro on 2011-12-20

Implementing minimization when launcher icon is clicked (LP: #733349).

Reference: https://bugs.launchpad.net/ayatana-design/+bug/733349/comments/58

1190. By Marco Biscaro on 2011-12-20

Merge with trunk

1189. By Marco Biscaro on 2011-12-20

Reverted changes

1188. By Marco Biscaro on 2011-05-18

Implementing minimization when launcher icon is clicked (LP: #733349).

Reference: https://bugs.launchpad.net/ayatana-design/+bug/733349/comments/58

=== modified file 'src/BamfLauncherIcon.cpp'
--- src/BamfLauncherIcon.cpp	2011-04-18 17:56:31 +0000
+++ src/BamfLauncherIcon.cpp	2011-05-18 20:41:09 +0000
@@ -65,10 +65,10 @@
 
   /* Behaviour:
    * 1) Nothing running -> launch application
-   * 2) Running and active -> spread application
+   * 2) Running and active -> spread application or minimize if enabled and there is only one window
    * 3) Running and not active -> focus application
    * 4) Spread is active and different icon pressed -> change spread
-   * 5) Spread is active -> Spread de-activated, and fall through
+   * 5) Spread is active -> Spread de-activated, and minimize all windows, if enabled
    */
 
   if (!running) // #1 above
@@ -81,8 +81,17 @@
   }
   else if (scaleWasActive)
   {
-    if (active ||           // #5 above
-        !Spread (0, false)) // #4 above
+    if (active) // #5 above
+    {
+      PluginAdapter::Default ()->TerminateScale ();
+      _launcher->SetLastSpreadIcon (NULL);
+
+      if (_launcher->GetMinimizeAll ()) // minimize all, if it is active
+      {
+        MinimizeAllWindows ();
+      }
+    }
+    else if (!Spread (0, false)) // #4 above
     {
       PluginAdapter::Default ()->TerminateScale ();
       Focus ();
@@ -95,7 +104,19 @@
   }
   else if (active && !scaleWasActive) // #2 above
   {
-    Spread (0, false);
+    GList *children;
+
+    children = bamf_view_get_children (BAMF_VIEW (m_App));
+    if (g_list_length (children) > 1) // if there is more than 1 window, open spread view
+    {
+      Spread (0, false);
+    }
+    else if (_launcher->GetMinimizeAll ()) // minimize the only window, if it is active
+    {
+      MinimizeAllWindows ();
+    }
+
+    g_list_free (children);
   }
 
   ubus_server_send_message (ubus_server_get_default (), UBUS_LAUNCHER_ACTION_DONE, NULL);
@@ -1102,3 +1123,26 @@
     break;
   }
 }
+
+void
+BamfLauncherIcon::MinimizeAllWindows ()
+{
+  GList *children, *l;
+  BamfView *view;
+
+  children = bamf_view_get_children (BAMF_VIEW (m_App));
+
+  for (l = children; l; l = l->next)
+  {
+    view = (BamfView *) l->data;
+
+    if (BAMF_IS_WINDOW (view))
+    {
+      guint32 xid = bamf_window_get_xid (BAMF_WINDOW (view));
+
+      WindowManager::Default ()->Minimize (xid);
+    }
+  }
+
+  g_list_free (children);
+}
 
=== modified file 'src/BamfLauncherIcon.h'
--- src/BamfLauncherIcon.h	2011-04-07 21:46:48 +0000
+++ src/BamfLauncherIcon.h	2011-05-18 20:41:09 +0000
@@ -121,6 +121,8 @@
                                       gpointer             data);
 
     static gboolean OnDndHoveredTimeout (gpointer data);
+    
+    void MinimizeAllWindows ();
 };
 
 #endif // BAMFLAUNCHERICON_H
 
=== modified file 'src/Launcher.cpp'
--- src/Launcher.cpp	2011-05-17 04:06:05 +0000
+++ src/Launcher.cpp	2011-05-18 20:41:09 +0000
@@ -471,6 +471,8 @@
     SettingsChanged (_settings, (gchar *)"shows-on-edge", this);
 
     SetDndEnabled (false, true);
+    
+    _minimize_all = false;
 }
 
 Launcher::~Launcher()
@@ -4248,3 +4250,15 @@
 {
   g_debug ("Lost the name %s on the session bus\n", name);
 }
+
+bool
+Launcher::GetMinimizeAll ()
+{
+  return _minimize_all;
+}
+
+void
+Launcher::SetMinimizeAll (bool minimize_all)
+{
+  _minimize_all = minimize_all;
+}
 
=== modified file 'src/Launcher.h'
--- src/Launcher.h	2011-04-20 03:59:36 +0000
+++ src/Launcher.h	2011-05-18 20:41:09 +0000
@@ -175,6 +175,9 @@
   sigc::signal<void, LauncherIcon *> launcher_removerequest;
   sigc::signal<void> selection_change;
   sigc::signal<void> hidden_changed;
+  
+  bool GetMinimizeAll ();
+  void SetMinimizeAll (bool minimizeAll);
 protected:
   // Introspectable methods
   const gchar* GetName ();
@@ -560,6 +563,8 @@
   guint32 _settings_changed_id;
 
   guint _ubus_handles[5];
+  
+  bool _minimize_all;
 };
 
 #endif // LAUNCHER_H
 
=== modified file 'src/LauncherIcon.cpp'
--- src/LauncherIcon.cpp	2011-05-13 03:33:19 +0000
+++ src/LauncherIcon.cpp	2011-05-18 20:41:09 +0000
@@ -189,9 +189,6 @@
 void
 LauncherIcon::Activate ()
 {
-    if (PluginAdapter::Default ()->IsScaleActive())
-      PluginAdapter::Default ()->TerminateScale ();
-    
     ActivateLauncherIcon ();
 }
 
 
=== modified file 'src/unityshell.cpp'
--- src/unityshell.cpp	2011-05-04 13:18:37 +0000
+++ src/unityshell.cpp	2011-05-18 20:41:09 +0000
@@ -754,15 +754,16 @@
       panelController->SetBFBSize (optionGetIconSize()+18);
       launcher->SetIconSize (optionGetIconSize()+6, optionGetIconSize());
       PlacesController::SetLauncherSize (optionGetIconSize()+18);
-      
       break;
     case UnityshellOptions::AutohideAnimation:
       launcher->SetAutoHideAnimation ((Launcher::AutoHideAnimation) optionGetAutohideAnimation ());
       break;
-
     case UnityshellOptions::DashBlurExperimental:
       PlacesSettings::GetDefault ()->SetDashBlurType ((PlacesSettings::DashBlurType)optionGetDashBlurExperimental ());
       break;
+    case UnityshellOptions::LauncherMinimizeAll:
+      launcher->SetMinimizeAll (optionGetLauncherMinimizeAll ());
+      break;
     default:
       break;
   }
@@ -936,6 +937,7 @@
   optionSetPanelFirstMenuInitiate (boost::bind (&UnityScreen::showPanelFirstMenuKeyInitiate, this, _1, _2, _3));
   optionSetPanelFirstMenuTerminate(boost::bind (&UnityScreen::showPanelFirstMenuKeyTerminate, this, _1, _2, _3));
   optionSetLauncherRevealEdgeInitiate (boost::bind (&UnityScreen::launcherRevealEdgeInitiate, this, _1, _2, _3));
+  optionSetLauncherMinimizeAllNotify (boost::bind (&UnityScreen::optionChanged, this, _1, _2));
 
   for (unsigned int i = 0; i < G_N_ELEMENTS (_ubus_handles); i++)
     _ubus_handles[i] = 0;
 
=== modified file 'unityshell.xml.in'
--- unityshell.xml.in	2011-04-11 08:01:24 +0000
+++ unityshell.xml.in	2011-05-18 20:41:09 +0000
@@ -187,7 +187,6 @@
                         <_name>Fade and Slide</_name>
                     </desc>
                 </option>
-
                 <option name="dash_blur_experimental" type="int">
                     <_short>Dash Blur</_short>
                     <_long>Type of blur in the Dash</_long>
@@ -203,6 +202,21 @@
                         <_name>Static Blur</_name>
                     </desc>
                 </option>
+                <option name="launcher_minimize_all" type="int">
+                    <_short>Minimize all</_short>
+                    <_long>Minimize all windows of the application when the launcher icon is clicked.</_long>
+                    <min>0</min>
+                    <max>1</max>
+                    <default>0</default>
+                    <desc>
+                        <value>0</value>
+                        <_name>Do not minimize</_name>
+                    </desc>
+                    <desc>
+                        <value>1</value>
+                        <_name>Minimize all</_name>
+                    </desc>
+                </option>
             </group>
         </options>
     </plugin>