Merge lp:~townsend/unity/fix-lp1301394-trusty into lp:unity/7.2

[Christopher Townsend]

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!).

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3821
http://jenkins.qa.ubuntu.com/job/unity-7.2-ci/5/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-armhf-ci/5
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-i386-ci/5/console

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

review: Needs Fixing (continuous-integration)

[Stephen M. Webb (bregma)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3821
http://jenkins.qa.ubuntu.com/job/unity-7.2-ci/16/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-amd64-ci/16
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-armhf-ci/16/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-i386-ci/16

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3821
http://jenkins.qa.ubuntu.com/job/unity-7.2-ci/17/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-amd64-ci/17/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-armhf-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-i386-ci/17

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3821
http://jenkins.qa.ubuntu.com/job/unity-7.2-ci/18/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-amd64-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-armhf-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-i386-ci/18

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

review: Approve (continuous-integration)

Unmerged revisions

3821. By Andrea Azzarone on 2015-05-15

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!).

=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2014-12-15 19:06:58 +0000
+++ launcher/Launcher.cpp	2015-05-15 19:54:26 +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;
 }