Merge lp:~brandontschaefer/unity/lp.982543-add-y-break-zone into lp:unity

[Brandon Schaefer]

Adds a Y break zone on the barrier so you can only break the barrier if pushing hard enough within this zone. Otherwise it resets the decay.

=== Problem ===
When moving against the barrier along the y axis, you can still break through the barrier. This can be annoying if you want to do something along the launcher.

=== Fix ===
Only allow the barriers to be broken if you are pushing up against the barrier in a small area of the Y axis. Right now it takes the event.y plus a 20 on both sides of the y axis. This gives 40 on the y axis to where you can break the barrier, if you move out of it, it resets the barrier decay to 0.

=== Tests ===
2 unit tests.

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

It works as expected, thanks.
A nice addon could have been a new setting, but that's something that we don't really need a this point.

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

review: Approve

=== modified file 'launcher/EdgeBarrierController.cpp'
--- launcher/EdgeBarrierController.cpp	2013-02-08 01:00:23 +0000
+++ launcher/EdgeBarrierController.cpp	2013-02-13 19:46:24 +0000
@@ -24,8 +24,15 @@
 #include "unity-shared/UScreen.h"
 #include "UnityCore/GLibSource.h"
 
-namespace unity {
-namespace ui {
+namespace unity
+{
+namespace ui
+{
+
+namespace
+{
+  int const Y_BREAK_BUFFER = 20;
+}
 
 
 EdgeBarrierController::Impl::Impl(EdgeBarrierController *parent)
@@ -119,7 +126,14 @@
 
 void EdgeBarrierController::Impl::BarrierPush(PointerBarrierWrapper* owner, BarrierEvent::Ptr const& event)
 {
-  decaymulator_.value = decaymulator_.value + event->velocity;
+  if (EventIsInsideYBreakZone(event))
+  {
+    decaymulator_.value = decaymulator_.value + event->velocity;
+  }
+  else
+  {
+    BarrierReset();
+  }
 
   if (decaymulator_.value > edge_overcome_pressure_)
   {
@@ -127,6 +141,22 @@
   }
 }
 
+bool EdgeBarrierController::Impl::EventIsInsideYBreakZone(BarrierEvent::Ptr const& event)
+{
+  static int y_break_zone = event->y;
+
+  if (decaymulator_.value <= 0)
+    y_break_zone = event->y;
+
+  if (event->y <= y_break_zone + Y_BREAK_BUFFER &&
+      event->y >= y_break_zone - Y_BREAK_BUFFER)
+  {
+    return true;
+  }
+
+  return false;
+}
+
 void EdgeBarrierController::Impl::OnPointerBarrierEvent(PointerBarrierWrapper* owner, BarrierEvent::Ptr const& event)
 {
   if (owner->released)

=== modified file 'launcher/EdgeBarrierControllerPrivate.h'
--- launcher/EdgeBarrierControllerPrivate.h	2013-02-07 21:47:21 +0000
+++ launcher/EdgeBarrierControllerPrivate.h	2013-02-13 19:46:24 +0000
@@ -42,6 +42,8 @@
   void BarrierRelease(PointerBarrierWrapper* owner, int event);
   void BarrierReset();
 
+  bool EventIsInsideYBreakZone(BarrierEvent::Ptr const& event);
+
   std::vector<PointerBarrierWrapper::Ptr> barriers_;
   std::vector<EdgeBarrierSubscriber*> subscribers_;
   Decaymulator decaymulator_;

=== modified file 'tests/test_edge_barrier_controller.cpp'
--- tests/test_edge_barrier_controller.cpp	2013-02-08 01:00:23 +0000
+++ tests/test_edge_barrier_controller.cpp	2013-02-13 19:46:24 +0000
@@ -342,4 +342,29 @@
     ASSERT_EQ(barrier->direction, BarrierDirection::BOTH);
 }
 
+TEST_F(TestEdgeBarrierController, BarrierDoesNotBreakIfYEventToFarApart)
+{
+  MockPointerBarrier owner;
+
+  int velocity = bc.options()->edge_overcome_pressure() * bc.options()->edge_responsiveness();
+  auto firstEvent = std::make_shared<BarrierEvent>(0, 50, velocity, 10);
+  auto secondEvent = std::make_shared<BarrierEvent>(0, 150, velocity, 11);
+
+  EXPECT_CALL(owner, ReleaseBarrier(_)).Times(0);
+  ProcessBarrierEvent(&owner, firstEvent);
+  ProcessBarrierEvent(&owner, secondEvent);
+}
+
+TEST_F(TestEdgeBarrierController, BarrierBreaksInYBreakZone)
+{
+  MockPointerBarrier owner;
+
+  int velocity = bc.options()->edge_overcome_pressure() * bc.options()->edge_responsiveness();
+  auto firstEvent = std::make_shared<BarrierEvent>(0, 50, velocity, 10);
+
+  EXPECT_CALL(owner, ReleaseBarrier(_)).Times(1);
+  ProcessBarrierEvent(&owner, firstEvent);
+  ProcessBarrierEvent(&owner, firstEvent);
+}
+
 }