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

[Andrea Azzarone]

Hide launcher to avoid damaging window when not needed. Also make sure that pressure effect works fine (previous fix has been reverted because of this!).

Hide launcher to avoid damaging window when not needed. Also make sure that pressure effect works fine (previous fix has been reverted because of this!).

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

Cool, everything works as expected now!

review: Approve

=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2014-12-12 22:33:24 +0000
+++ launcher/Launcher.cpp	2015-03-23 14:20:29 +0000
@@ -1108,6 +1108,9 @@
   postreveal_mousemove_delta_x_ = 0;
   postreveal_mousemove_delta_y_ = 0;
 
+  if (!hide_launcher)
+    parent_->ShowWindow(true);
+
   if (nux::GetWindowThread()->IsEmbeddedWindow())
     parent_->EnableInputWindow(!hide_launcher, launcher::window_title, false, false);
 
@@ -1681,6 +1684,13 @@
   RenderArgs(args, bkg_box, &launcher_alpha, geo_absolute);
   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)
+  {
+    parent_->ShowWindow(false);
+  }
+
   nux::Color clear_colour = nux::Color(0x00000000);
 
   // clear region
@@ -2270,7 +2280,10 @@
     return ui::EdgeBarrierSubscriber::Result::IGNORED;
 
   if (!owner->IsFirstEvent())
+  {
+    parent_->ShowWindow(true);
     hide_machine_.AddRevealPressure(event->velocity);
+  }
 
   return ui::EdgeBarrierSubscriber::Result::HANDLED;
 }