Merge lp:~townsend/unity/click-to-minimize into lp:unity

[Christopher Townsend]

Add ability to minimize a single window application when clicking on the Launcher icon of the application.

Add ability to minimize a single window application when clicking on the Launcher icon of the application. This is turned off by default.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3727
http://jenkins.qa.ubuntu.com/job/unity-ci/806/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/342
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/338
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/340

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/806/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3728
http://jenkins.qa.ubuntu.com/job/unity-ci/808/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/344
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/340
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/342/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/808/rebuild

review: Needs Fixing (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

Works beautifully :).

review: Approve

=== modified file 'launcher/AbstractLauncherIcon.cpp'
--- launcher/AbstractLauncherIcon.cpp	2014-03-12 18:20:51 +0000
+++ launcher/AbstractLauncherIcon.cpp	2014-03-18 16:39:21 +0000
@@ -23,6 +23,7 @@
 namespace launcher {
   nux::Property<unsigned> AbstractLauncherIcon::icon_size(48);
   nux::Property<bool> AbstractLauncherIcon::scroll_inactive_icons(true);
+  nux::Property<bool> AbstractLauncherIcon::minimize_window_on_click(false);
 
   // needed for ungodly stupid reasons
   NUX_IMPLEMENT_OBJECT_TYPE(AbstractLauncherIcon);
 
=== modified file 'launcher/AbstractLauncherIcon.h'
--- launcher/AbstractLauncherIcon.h	2014-03-07 18:44:31 +0000
+++ launcher/AbstractLauncherIcon.h	2014-03-18 16:39:21 +0000
@@ -135,6 +135,7 @@
 
   static nux::Property<unsigned> icon_size;
   static nux::Property<bool> scroll_inactive_icons;
+  static nux::Property<bool> minimize_window_on_click;
   nux::Property<std::string> tooltip_text;
   nux::Property<bool> tooltip_enabled;
   nux::Property<Position> position;
 
=== modified file 'launcher/ApplicationLauncherIcon.cpp'
--- launcher/ApplicationLauncherIcon.cpp	2014-03-12 23:46:10 +0000
+++ launcher/ApplicationLauncherIcon.cpp	2014-03-18 16:39:21 +0000
@@ -399,7 +399,16 @@
       {
         if (arg.source != ActionArg::Source::SWITCHER)
         {
-          Spread(true, 0, false);
+          WindowList windows = GetWindows(WindowFilter::ON_CURRENT_DESKTOP);
+
+          if (windows.size() == 1 && minimize_window_on_click)
+          {
+            wm.Minimize(windows[0]->window_id());
+          }
+          else
+          {
+            Spread(true, 0, false);
+          }
         }
       }
     }
 
=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2014-03-13 23:16:47 +0000
+++ launcher/Launcher.cpp	2014-03-18 16:39:21 +0000
@@ -1217,6 +1217,7 @@
   SetIconSize(options->tile_size, options->icon_size);
   SetHideMode(options->hide_mode);
   SetScrollInactiveIcons(options->scroll_inactive_icons);
+  SetLauncherMinimizeWindow(options->minimize_window_on_click);
 
   if (model_)
   {
@@ -1498,6 +1499,11 @@
   AbstractLauncherIcon::scroll_inactive_icons = scroll;
 }
 
+void Launcher::SetLauncherMinimizeWindow(bool click_to_minimize)
+{
+  AbstractLauncherIcon::minimize_window_on_click = click_to_minimize;
+}
+
 void Launcher::SetIconSize(int tile_size, int icon_size)
 {
   ui::IconRenderer::DestroyShortcutTextures();
 
=== modified file 'launcher/Launcher.h'
--- launcher/Launcher.h	2014-03-13 23:16:47 +0000
+++ launcher/Launcher.h	2014-03-18 16:39:21 +0000
@@ -80,6 +80,7 @@
   AbstractLauncherIcon::Ptr GetSelectedMenuIcon() const;
 
   void SetScrollInactiveIcons(bool scroll);
+  void SetLauncherMinimizeWindow(bool click_to_minimize);
 
   void SetIconSize(int tile_size, int icon_size);
   int GetIconSize() const;
 
=== modified file 'launcher/LauncherOptions.cpp'
--- launcher/LauncherOptions.cpp	2014-03-07 18:44:31 +0000
+++ launcher/LauncherOptions.cpp	2014-03-18 16:39:21 +0000
@@ -47,6 +47,7 @@
   , edge_resist(true)
   , show_for_all(false)
   , scroll_inactive_icons(false)
+  , minimize_window_on_click(false)
 {
   auto changed_lambda = [this] {
     changed_idle_.reset(new glib::Idle(glib::Source::Priority::HIGH));
@@ -72,6 +73,7 @@
   urgent_animation.changed.connect(sigc::hide(changed_lambda));
   edge_resist.changed.connect(sigc::hide(changed_lambda));
   scroll_inactive_icons.changed.connect(sigc::hide(changed_lambda));
+  minimize_window_on_click.changed.connect(sigc::hide(changed_lambda));
 }
 
 }
 
=== modified file 'launcher/LauncherOptions.h'
--- launcher/LauncherOptions.h	2014-03-07 18:44:31 +0000
+++ launcher/LauncherOptions.h	2014-03-18 16:39:21 +0000
@@ -103,6 +103,7 @@
   nux::Property<bool> edge_resist;
   nux::Property<bool> show_for_all;
   nux::Property<bool> scroll_inactive_icons;
+  nux::Property<bool> minimize_window_on_click;
 
   sigc::signal<void> option_changed;
 
 
=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2014-03-13 23:17:17 +0000
+++ plugins/unityshell/src/unityshell.cpp	2014-03-18 16:39:21 +0000
@@ -380,6 +380,7 @@
      optionSetLauncherCaptureMouseNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
 
      optionSetScrollInactiveIconsNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
+     optionSetLauncherMinimizeWindowNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
 
      ubus_manager_.RegisterInterest(UBUS_LAUNCHER_START_KEY_NAV,
                    sigc::mem_fun(this, &UnityScreen::OnLauncherStartKeyNav));
@@ -3401,6 +3402,9 @@
     case UnityshellOptions::ScrollInactiveIcons:
       launcher_options->scroll_inactive_icons = optionGetScrollInactiveIcons();
       break;
+    case UnityshellOptions::LauncherMinimizeWindow:
+      launcher_options->minimize_window_on_click = optionGetLauncherMinimizeWindow();
+      break;
     case UnityshellOptions::BackgroundColor:
     {
       auto override_color = NuxColorFromCompizColor(optionGetBackgroundColor());
@@ -3827,6 +3831,7 @@
   });
 
   launcher_controller_->options()->scroll_inactive_icons = optionGetScrollInactiveIcons();
+  launcher_controller_->options()->minimize_window_on_click = optionGetLauncherMinimizeWindow();
 
   ScheduleRelayout(0);
 }
 
=== modified file 'plugins/unityshell/unityshell.xml.in'
--- plugins/unityshell/unityshell.xml.in	2014-03-12 23:44:48 +0000
+++ plugins/unityshell/unityshell.xml.in	2014-03-18 16:39:21 +0000
@@ -362,6 +362,12 @@
                     <default>true</default>
                 </option>
 
+                <option name="launcher_minimize_window" type="bool">
+                    <_short>Minimize Single Window Applications (Unsupported)</_short>
+                    <_long>Allows minimizing a single windowed application by clicking on its Launcher icon.</_long>
+                    <default>false</default>
+                </option>
+
                 <option name="edge_responsiveness" type="float">
                     <_short>Launcher Reveal Edge Responsiveness</_short>
                     <_long>A conglomerate setting that modifies the overall responsiveness of the Launcher reveal.</_long>