Merge lp:~ojno/unity/minimize-on-click into lp:unity

[Jonathan French]

Implements #733349, specifically comment 58's spec - minimize windows as part of the launcher icon click cycle.

I know that bug was marked wontfix, but this *vastly* improves the everyday usability of Unity, and the change is only a few lines. Please reconsider this.

I realise at this point it won't make it into Precise, but please at least un-wontfix the bug. Open source projects should listen to their users, especially when they aren't just blueskying but actually contribute code! ;)

[Marco Trevisan (Treviño) (3v1n0)]

Sorry, but I must to reject this MP, since this is an unwanted behavior according to design.

review: Disapprove

[GonzO (gonzo)]

The feature shouldn't be rejected - the design should be reconsidered.

review: Needs Resubmitting

[Jonathan French (ojno)]

I've created a PPA of this: https://launchpad.net/~ojno/+archive/unity-minimize-on-click

This has been covered here: http://www.webupd8.org/2012/03/unity-with-minimize-on-click-patch.html

Please think about this. If you look at the linked bug, you can see people discover it every few days (for nearly a year now!) and express their incredulity that this basic behaviour is missing from Unity.

[Vishnu Rao (vishnumrao)]

This is a much needed design change. I vote this up! Minimize on click is intuitive. It maybe a mimicking Windows, but its useful.

Lets try to make Ubuntu different, but lets pick up useful features from other OSes.

[Aleve Sicofante (sicofante)]

It's also available on OS X as a dock preference (not the default though).

A big THANK YOU to Jonathan and a big boo to the design team, for not listening and not reasoning.

[zwigno (zwigno)]

Seems like they're just being strict about sticking to the design spec. Let's lobby for a design spec change instead. Anybody know how to do that?

[dstaubsauger (dickerstaubsauger)]

Meeeh, why can't you add the feature optionally, meaning users would have to turn it on in the settings dialogue? That way everybody will be happy and in the meantime you can ask your design team why they didn't want it.

[Jonathan French (ojno)]

New version of the PPA released: Restores the previous behaviour when the launcher icon is clicked with the Spread open, and adds a "Minimize" item to the quicklist.

Hopefully this is more likely to be merged, since it now doesn't touch the Spread behaviour at all.

I'm trying to merge this change into this branch, but I'm having trouble, being new to bzr. I'll figure it out soon.

[Dvanzo (danielvanzo)]

HI!,
I was using this patch without problems, but today unity was updated and can't use it anymore... Any plans to apply this patch to the new unity version??? Unity is almost useless without it for me!!!

Regards,

Daniel

Unmerged revisions

2131. By Jonathan French on 2012-03-27

Restore the previous behaviour when the launcher icon is clicked with the Spread open; add a Minimize item to the quicklist

2130. By Jonathan French on 2012-03-27

merge from upstream

2129. By Jonathan French on 2012-03-19

Add window minimize to launcher icon click actions

=== modified file 'plugins/unityshell/src/BamfLauncherIcon.cpp'
--- plugins/unityshell/src/BamfLauncherIcon.cpp	2012-03-16 01:48:22 +0000
+++ plugins/unityshell/src/BamfLauncherIcon.cpp	2012-03-19 23:17:20 +0000
@@ -231,10 +231,11 @@
 
   /* Behaviour:
    * 1) Nothing running, or nothing visible -> launch application
-   * 2) Running and active -> spread application
+   * 2a) Running and active with more than one window -> spread application
+   * 2b) Running and active with only one window -> minimize application
    * 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 -> minimize application
    */
 
   if (!IsRunning() || (IsRunning() && !user_visible)) // #1 above
@@ -257,13 +258,17 @@
       if (scaleWasActive) // #5 above
       {
         WindowManager::Default()->TerminateScale();
-        Focus(arg);
+        Minimize(Windows(true));
       }
       else // #2 above
       {
         if (arg.source != ActionArg::SWITCHER)
         {
-          Spread(true, 0, false);
+          std::vector<Window> windowList = Windows(true);
+          if (windowList.size() == 1) // #2b above
+            Minimize(windowList);
+          else // #2a above
+            Spread(windowList, 0, false);
         }
       }
     }
@@ -274,7 +279,7 @@
         WindowManager::Default()->TerminateScale();
         Focus(arg);
         if (arg.source != ActionArg::SWITCHER)
-          Spread(true, 0, false);
+          Spread(Windows(true), 0, false);
       }
       else // #3 above
       {
@@ -287,7 +292,7 @@
     ubus_server_send_message(ubus_server_get_default(), UBUS_LAUNCHER_ACTION_DONE, nullptr);
 }
 
-std::vector<Window> BamfLauncherIcon::Windows()
+std::vector<Window> BamfLauncherIcon::Windows(bool current_desktop)
 {
   std::vector<Window> results;
   GList* children, *l;
@@ -301,7 +306,7 @@
 
     Window xid = bamf_window_get_xid(static_cast<BamfWindow*>(l->data));
 
-    if (wm->IsWindowMapped(xid))
+    if (wm->IsWindowMapped(xid) && (!current_desktop || wm->IsWindowOnCurrentDesktop(xid)))
     {
       results.push_back(xid);
     }
@@ -609,30 +614,17 @@
   }
 }
 
-bool BamfLauncherIcon::Spread(bool current_desktop, int state, bool force)
+bool BamfLauncherIcon::Spread(std::vector<Window> windowList, int state, bool force)
 {
-  GList* children, *l;
-  children = bamf_view_get_children(BAMF_VIEW(_bamf_app.RawPtr()));
-  WindowManager* wm = WindowManager::Default();
-
-  std::vector<Window> windowList;
-  for (l = children; l; l = l->next)
-  {
-    if (!BAMF_IS_WINDOW(l->data))
-      continue;
-
-    Window xid = bamf_window_get_xid(static_cast<BamfWindow*>(l->data));
-
-    if (!current_desktop || (current_desktop && wm->IsWindowOnCurrentDesktop(xid)))
-    {
-      windowList.push_back(xid);
-    }
-  }
-
-  g_list_free(children);
   return WindowManager::Default()->ScaleWindowGroup(windowList, state, force);
 }
 
+void BamfLauncherIcon::Minimize(std::vector<Window> windowList)
+{
+  for (unsigned int i = 0; i < windowList.size(); i++)
+    WindowManager::Default()->Minimize(windowList[i]);
+}
+
 void BamfLauncherIcon::EnsureWindowState()
 {
   GList* children, *l;

=== modified file 'plugins/unityshell/src/BamfLauncherIcon.h'
--- plugins/unityshell/src/BamfLauncherIcon.h	2012-02-12 10:43:11 +0000
+++ plugins/unityshell/src/BamfLauncherIcon.h	2012-03-19 23:17:20 +0000
@@ -60,7 +60,7 @@
   virtual bool ShowInSwitcher(bool current);
   virtual unsigned long long SwitcherPriority();
 
-  std::vector<Window> Windows();
+  std::vector<Window> Windows(bool current_desktop = false);
   std::vector<Window> WindowsForMonitor(int monitor);
   std::string NameForWindow(Window window);
 
@@ -96,7 +96,8 @@
 
   void OpenInstanceWithUris(std::set<std::string> uris);
   void Focus(ActionArg arg);
-  bool Spread(bool current_desktop, int state, bool force);
+  bool Spread(std::vector<Window>, int state, bool force);
+  void Minimize(std::vector<Window> current_desktop);
 
   void OnWindowMinimized(guint32 xid);
   void OnWindowMoved(guint32 xid);