Merge lp:~azzar1/unity/fix-lp-1450991 into lp:unity

[Andrea Azzarone]

Fix a regression with urgent icons not showing up if launcher is hidden.

Fix a regression with urgent icons not showing up if launcher is hidden.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3965
http://jenkins.qa.ubuntu.com/job/unity-ci/1228/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/4

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

review: Approve (continuous-integration)

[Stephen M. Webb (bregma)]

review: Approve

=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2015-04-16 14:38:54 +0000
+++ launcher/Launcher.cpp	2015-05-22 12:33:34 +0000
@@ -686,6 +686,11 @@
   float present_progress = icon->GetQuirkProgress(AbstractLauncherIcon::Quirk::PRESENTED, monitor());
   icon_hide_offset *= 1.0f - (present_progress * icon->PresentUrgency());
 
+  if (present_progress > 0.0f)
+  {
+    parent_->ShowWindow(true);
+  }
+
   // icon is crossing threshold, start folding
   center.z += folded_z_distance * folding_progress;
   arg.rotation.x = animation_neg_rads * folding_progress;
@@ -738,7 +743,7 @@
 }
 
 void Launcher::RenderArgs(std::list<RenderArg> &launcher_args,
-                          nux::Geometry& box_geo, float* launcher_alpha, nux::Geometry const& parent_abs_geo)
+                          nux::Geometry& box_geo, float* launcher_alpha, nux::Geometry const& parent_abs_geo, bool& force_show_window)
 {
   nux::Geometry const& geo = GetGeometry();
   LauncherModel::iterator it;
@@ -912,6 +917,8 @@
   folding_threshold += shelf_delta;
   center.y += shelf_delta;
 
+  force_show_window = false;
+
   for (it = model_->shelf_begin(); it != model_->shelf_end(); ++it)
   {
     RenderArg arg;
@@ -921,6 +928,9 @@
                   autohide_offset, folded_z_distance, animation_neg_rads);
     arg.colorify = colorify;
     launcher_args.push_back(arg);
+
+    if (autohide_offset != 0)
+      force_show_window = true;
   }
 }
 
@@ -1680,13 +1690,15 @@
   ROP.SrcBlend = GL_ONE;
   ROP.DstBlend = GL_ONE_MINUS_SRC_ALPHA;
 
+  bool force_show_window;
   nux::Geometry const& geo_absolute = GetAbsoluteGeometry();
-  RenderArgs(args, bkg_box, &launcher_alpha, geo_absolute);
+  RenderArgs(args, bkg_box, &launcher_alpha, geo_absolute, force_show_window);
   bkg_box.width -= RIGHT_LINE_WIDTH.CP(cv_);
 
   if (options()->hide_mode != LAUNCHER_HIDE_NEVER &&
       bkg_box.x + bkg_box.width <= 0 &&
-      hide_machine_.reveal_progress <= 0)
+      hide_machine_.reveal_progress <= 0 &&
+      !force_show_window)
   {
     parent_->ShowWindow(false);
   }
 
=== modified file 'launcher/Launcher.h'
--- launcher/Launcher.h	2015-04-15 15:45:22 +0000
+++ launcher/Launcher.h	2015-05-22 12:33:34 +0000
@@ -265,7 +265,7 @@
                      float animation_neg_rads);
 
   void RenderArgs(std::list<ui::RenderArg> &launcher_args,
-                  nux::Geometry& box_geo, float* launcher_alpha, nux::Geometry const& parent_abs_geo);
+                  nux::Geometry& box_geo, float* launcher_alpha, nux::Geometry const& parent_abs_geo, bool& force_show_window);
 
   void OnIconAdded(AbstractLauncherIcon::Ptr const& icon);
   void OnIconRemoved(AbstractLauncherIcon::Ptr const& icon);