Merge lp:~azzar1/unity/fix-1170720 into lp:~unity-team/unity/libunity-7.0-breakage

[Andrea Azzarone]

Don't close the dash if the mouse is over the vertical line between the dash and the launcher.

== Problem ==
Dash should only close when a icon is dragged outside of the Dash/Launcher area

== Fix ==
Don't close the dash if the mouse is over the vertical line between the dash and the launcher.

== Test ==
Cannot be unit-tested because nux does not allow setting/injecting the current event.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3120
http://jenkins.qa.ubuntu.com/job/unity-team-unity-libunity-7.0-breakage-ci/55/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-libunity-7.0-breakage-raring-amd64-ci/55

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-unity-libunity-7.0-breakage-ci/55/rebuild

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

LGTM.

review: Approve

=== modified file 'dash/DashView.cpp'
--- dash/DashView.cpp	2013-04-17 15:10:39 +0000
+++ dash/DashView.cpp	2013-04-19 19:19:28 +0000
@@ -1462,7 +1462,11 @@
 
 void DashView::ProcessDndEnter()
 {
-  ubus_manager_.SendMessage(UBUS_OVERLAY_CLOSE_REQUEST);
+  auto const& event = nux::GetGraphicsDisplay()->GetCurrentEvent();
+
+  // Don't close the dash if the mouse is over the vertical line between the dash and the launcher.
+  if (event.x != GetAbsoluteX())
+    ubus_manager_.SendMessage(UBUS_OVERLAY_CLOSE_REQUEST);
 }
 
 nux::Area* DashView::FindKeyFocusArea(unsigned int key_symbol,