Merge lp:~azzar1/unity/fix-1035304-dnd-edge into lp:unity

[Andrea Azzarone]

Disable sticky edges during drag and drop.

== Probelem ==
Bug #1035304: Window management - When dragging a icon or selected text, sticky edges should not apply (regardless of sticky edge setting)

== Fix ==
Release pointer barrier in Launcher::HandlePointerBarrier.

== Test ==
Unit test added.

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

Good, thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/165/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/165/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/165/console

review: Needs Fixing (continuous-integration)

=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2012-11-24 15:34:32 +0000
+++ launcher/Launcher.cpp	2012-11-26 19:33:21 +0000
@@ -1119,7 +1119,6 @@
   // function is not smooth it is continuous, which is more important for our visual representation (icons
   // wont start jumping around).  As a general rule ANY if () statements that modify center.y should be seen
   // as bugs.
-  int index = 1;
   for (it = _model->main_begin(); it != _model->main_end(); ++it)
   {
     RenderArg arg;
@@ -1128,7 +1127,6 @@
                   autohide_offset, folded_z_distance, animation_neg_rads, current);
     arg.colorify = colorify;
     launcher_args.push_back(arg);
-    index++;
   }
 
   // compute maximum height of shelf
@@ -2261,7 +2259,13 @@
 
 bool Launcher::HandleBarrierEvent(ui::PointerBarrierWrapper* owner, ui::BarrierEvent::Ptr event)
 {
-  nux::Geometry abs_geo = GetAbsoluteGeometry();
+  if (_hide_machine.GetQuirk(LauncherHideMachine::EXTERNAL_DND_ACTIVE))
+  {
+    owner->ReleaseBarrier(event->event_id);
+    return true;
+  }
+
+  nux::Geometry const& abs_geo = GetAbsoluteGeometry();
 
   bool apply_to_reveal = false;
   if (_hidden && event->x >= abs_geo.x && event->x <= abs_geo.x + abs_geo.width)
@@ -2631,7 +2635,7 @@
 
   SetMousePosition(x - _parent->GetGeometry().x, y - _parent->GetGeometry().y);
 
-  if (!IsOverlayOpen() && _mouse_position.x == 0 && _mouse_position.y <= (_parent->GetGeometry().height - _icon_size - 2 * _space_between_icons) && !_drag_edge_touching)
+  if (monitor() == 0 && !IsOverlayOpen() && _mouse_position.x == 0 && _mouse_position.y <= (_parent->GetGeometry().height - _icon_size - 2 * _space_between_icons) && !_drag_edge_touching)
   {
     if (_dnd_hovered_icon)
         _dnd_hovered_icon->SendDndLeave();

=== modified file 'tests/test_launcher.cpp'
--- tests/test_launcher.cpp	2012-11-15 22:31:46 +0000
+++ tests/test_launcher.cpp	2012-11-26 19:33:21 +0000
@@ -54,6 +54,11 @@
   MOCK_METHOD1(Stick, void(bool));
 };
 
+struct MockPointerBarrierWrapper : ui::PointerBarrierWrapper
+{
+  MOCK_METHOD1(ReleaseBarrier, void(int event_id));
+};
+
 }
 
 class TestLauncher : public Test
@@ -114,6 +119,11 @@
 
       _dnd_hovered_icon = MouseIconIntersection(x, y);
     }
+
+    bool HandleBarrierEvent(ui::PointerBarrierWrapper* barrier, ui::BarrierEvent::Ptr event)
+    {
+      return Launcher::HandleBarrierEvent(barrier, event);
+    }
   };
 
   TestLauncher()
@@ -437,6 +447,17 @@
   EXPECT_FALSE(mouse_entered);
 }
 
+TEST_F(TestLauncher, EdgeResistDuringDnd)
+{
+  auto barrier = std::make_shared<MockPointerBarrierWrapper>();
+  auto event = std::make_shared<ui::BarrierEvent>(0, 0, 0, 100);
+
+  launcher_->DndStarted("");
+
+  EXPECT_CALL(*barrier, ReleaseBarrier(100));
+  EXPECT_TRUE(launcher_->HandleBarrierEvent(barrier.get(), event));
+}
+
 TEST_F(TestLauncher, DndIsSpecialRequest)
 {
   EXPECT_TRUE(launcher_->DndIsSpecialRequest("MyFile.desktop"));