Merge lp:~azzar1/unity/lp-1155598 into lp:unity

[Andrea Azzarone]

Don't release the barrier on single monitor.

== Problem ==
Autohide launcher can be stuck hidden

== Fix ==
Don't release the barrier on single monitor.

== Test ==
Unit test added.

[Brandon Schaefer (brandontschaefer)]

Hmm wont this still be a problem with 2 edge barriers? I mean to get it stuck at the moment is you move hard enough into the barrier to break it while showing the launcher. Then moving the mouse away and back against it before the barrier is rebuilt so it keeps releasing the barrier....So this will still be a problem with more then 1 monitor right?

review: Needs Information

[Andrea Azzarone (azzar1)]

> Hmm wont this still be a problem with 2 edge barriers? I mean to get it stuck
> at the moment is you move hard enough into the barrier to break it while
> showing the launcher. Then moving the mouse away and back against it before
> the barrier is rebuilt so it keeps releasing the barrier....So this will still
> be a problem with more then 1 monitor right?

I need to try. Thanks ;)

Unmerged revisions

3232. By Andrea Azzarone on 2013-03-19

Don't release the barrier on single monitor.

=== modified file 'launcher/EdgeBarrierController.cpp'
--- launcher/EdgeBarrierController.cpp	2013-02-13 19:21:49 +0000
+++ launcher/EdgeBarrierController.cpp	2013-03-20 02:25:28 +0000
@@ -206,6 +206,9 @@
 
 void EdgeBarrierController::Impl::BarrierRelease(PointerBarrierWrapper* owner, int event)
 {
+  if (barriers_.size() <= 1)
+    return;
+
   owner->ReleaseBarrier(event);
   owner->released = true;
   BarrierReset();

=== modified file 'tests/test_edge_barrier_controller.cpp'
--- tests/test_edge_barrier_controller.cpp	2013-02-13 19:21:49 +0000
+++ tests/test_edge_barrier_controller.cpp	2013-03-20 02:25:28 +0000
@@ -367,4 +367,14 @@
   ProcessBarrierEvent(&owner, firstEvent);
 }
 
+TEST_F(TestEdgeBarrierController, BreakingEdgeOnSingleMonitorDoesNotReleasesBarrier)
+{
+  MockPointerBarrier owner;
+  uscreen.Reset();
+
+  EXPECT_CALL(owner, ReleaseBarrier(_)).Times(0);
+  ProcessBarrierEvent(&owner, MakeBarrierEvent(1, true));
+  ASSERT_FALSE(owner.released());
+}
+
 }