Merge lp:~3v1n0/unity/launcher-autohide-drag-window-6.0 into lp:unity/6.0

[Marco Trevisan (Treviño)]

Launcher: check the mouse position after relasing a drag window, and in case hide it

Tests included

Backported branch lp:~3v1n0/unity/launcher-autohide-drag-window to unity-6.0

[Andrea Azzarone (azzar1)]

review: Approve

=== modified file 'dash/previews/Preview.cpp'
--- dash/previews/Preview.cpp	2012-09-18 09:05:50 +0000
+++ dash/previews/Preview.cpp	2012-09-24 16:03:35 +0000
@@ -102,8 +102,9 @@
 
   nux::InputArea* DefaultFocus() const
   {
-    if (areas_.size() == 0)
-      return NULL;
+    if (areas_.empty())
+      return nullptr;
+
     return *areas_.begin();
   }
 
@@ -111,10 +112,10 @@
                                       unsigned long x11_key_code,
                                       unsigned long special_keys_state)
   {
-    if (areas_.size() == 0)
+    if (areas_.empty())
       return nullptr;
 
-    nux::InputArea* current_focus_area = nux::GetWindowCompositor().GetKeyFocusArea();  
+    nux::InputArea* current_focus_area = nux::GetWindowCompositor().GetKeyFocusArea();
     auto it = std::find(areas_.begin(), areas_.end(), current_focus_area);
     if (it != areas_.end())
       return current_focus_area;
@@ -124,7 +125,7 @@
 
   nux::Area* KeyNavIteration(nux::KeyNavDirection direction)
   {
-    if (areas_.size() == 0)
+    if (areas_.empty())
       return nullptr;
 
     if (direction != nux::KEY_NAV_TAB_PREVIOUS && direction != nux::KEY_NAV_TAB_NEXT)
 
=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2012-09-19 07:09:26 +0000
+++ launcher/Launcher.cpp	2012-09-24 16:03:35 +0000
@@ -1334,12 +1334,13 @@
 
   // check the state before changing it to avoid uneeded hide calls
   if (!_hide_machine.GetQuirk(LauncherHideMachine::MOUSE_MOVE_POST_REVEAL) &&
-     (nux::Abs(_postreveal_mousemove_delta_x) > MOUSE_DEADZONE ||
-     nux::Abs(_postreveal_mousemove_delta_y) > MOUSE_DEADZONE))
-       _hide_machine.SetQuirk(LauncherHideMachine::MOUSE_MOVE_POST_REVEAL, true);
+     (std::abs(_postreveal_mousemove_delta_x) > MOUSE_DEADZONE ||
+      std::abs(_postreveal_mousemove_delta_y) > MOUSE_DEADZONE))
+  {
+    _hide_machine.SetQuirk(LauncherHideMachine::MOUSE_MOVE_POST_REVEAL, true);
+  }
 }
 
-
 int Launcher::GetMouseX() const
 {
   return _mouse_position.x;
@@ -2091,6 +2092,12 @@
 
 void Launcher::HideDragWindow()
 {
+  nux::Geometry const& abs_geo = GetAbsoluteGeometry();
+  nux::Point const& mouse = nux::GetWindowCompositor().GetMousePosition();
+
+  if (abs_geo.IsInside(mouse))
+    mouse_enter.emit(mouse.x - abs_geo.x, mouse.y - abs_geo.y, 0, 0);
+
   if (!_drag_window)
     return;
 
 
=== modified file 'tests/test_launcher.cpp'
--- tests/test_launcher.cpp	2012-09-11 12:13:45 +0000
+++ tests/test_launcher.cpp	2012-09-24 16:03:35 +0000
@@ -33,7 +33,6 @@
 #include "unity-shared/UnitySettings.h"
 #include "unity-shared/IconRenderer.h"
 #include "test_utils.h"
-using namespace unity;
 
 namespace unity
 {
@@ -210,6 +209,14 @@
   nux::ObjectPtr<MockLauncher> launcher_;
 };
 
+struct TestWindowCompositor
+{
+  static void SetMousePosition(int x, int y)
+  {
+    nux::GetWindowCompositor()._mouse_position = nux::Point(x, y);
+  }
+};
+
 TEST_F(TestLauncher, TestQuirksDuringDnd)
 {
   MockMockLauncherIcon::Ptr first(new MockMockLauncherIcon);
@@ -435,6 +442,34 @@
   launcher_->EndIconDrag();
 }
 
+TEST_F(TestLauncher, DragLauncherIconHidesOverLauncherEmitsMouseEnter)
+{
+  bool mouse_entered = false;
+
+  launcher_->mouse_enter.connect([&mouse_entered] (int x, int y, unsigned long, unsigned long) {
+    mouse_entered = true;
+    EXPECT_EQ(x, 1);
+    EXPECT_EQ(y, 2);
+  });
+
+  auto const& abs_geo = launcher_->GetAbsoluteGeometry();
+  TestWindowCompositor::SetMousePosition(abs_geo.x + 1, abs_geo.y + 2);
+  launcher_->HideDragWindow();
+  EXPECT_TRUE(mouse_entered);
+}
+
+TEST_F(TestLauncher, DragLauncherIconHidesOutsideLauncherEmitsMouseEnter)
+{
+  bool mouse_entered = false;
+  launcher_->mouse_enter.connect([&mouse_entered] (int, int, unsigned long, unsigned long)
+                                 { mouse_entered = true; });
+
+  auto const& abs_geo = launcher_->GetAbsoluteGeometry();
+  TestWindowCompositor::SetMousePosition(abs_geo.x - 1, abs_geo.y - 2);
+  launcher_->HideDragWindow();
+  EXPECT_FALSE(mouse_entered);
+}
+
 TEST_F(TestLauncher, DndIsSpecialRequest)
 {
   EXPECT_TRUE(launcher_->DndIsSpecialRequest("MyFile.desktop"));