Merge lp:~3v1n0/unity/icon-dragging-cancels-on-windows-mapping into lp:unity

[Marco Trevisan (Treviño)]

LauncherDragWindow: cancel drag on window mapped/unmapped

Make sure that an icon dragged from the launcher emits a drag-cancel signal when a window is mapped/unmapped.

unit tests added.

[Andrea Azzarone (azzar1)]

LGTM.

review: Approve

=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2012-08-31 21:32:38 +0000
+++ launcher/Launcher.cpp	2012-09-01 14:28:19 +0000
@@ -177,9 +177,8 @@
   ql_manager.quicklist_closed.connect(sigc::mem_fun(this, &Launcher::RecvQuicklistClosed));
 
   WindowManager& plugin_adapter = *(WindowManager::Default());
-  plugin_adapter.window_mapped.connect(sigc::mem_fun(this, &Launcher::OnWindowMapped));
-  plugin_adapter.window_unmapped.connect(sigc::mem_fun(this, &Launcher::OnWindowUnmapped));
-
+  plugin_adapter.window_mapped.connect(sigc::hide(sigc::mem_fun(this, &Launcher::DndTimeoutSetup)));
+  plugin_adapter.window_unmapped.connect(sigc::hide(sigc::mem_fun(this, &Launcher::DndTimeoutSetup)));
   plugin_adapter.initiate_spread.connect(sigc::mem_fun(this, &Launcher::OnPluginStateChanged));
   plugin_adapter.initiate_expo.connect(sigc::mem_fun(this, &Launcher::OnPluginStateChanged));
   plugin_adapter.terminate_spread.connect(sigc::mem_fun(this, &Launcher::OnPluginStateChanged));
@@ -1392,27 +1391,6 @@
   sources_.AddTimeout(200, cb_func, DND_CHECK_TIMEOUT);
 }
 
-void Launcher::OnWindowMapped(guint32 xid)
-{
-  //CompWindow* window = _screen->findWindow(xid);
-  //if (window && window->type() | CompWindowTypeDndMask)
-  //{
-    DndTimeoutSetup();
-  //}
-
-  if (GetActionState() != ACTION_NONE)
-    ResetMouseDragState();
-}
-
-void Launcher::OnWindowUnmapped(guint32 xid)
-{
-  //CompWindow* window = _screen->findWindow(xid);
-  //if (window && window->type() | CompWindowTypeDndMask)
-  //{
-    DndTimeoutSetup();
-  //}
-}
-
 void Launcher::OnPluginStateChanged()
 {
   _hide_machine.SetQuirk (LauncherHideMachine::EXPO_ACTIVE, WindowManager::Default ()->IsExpoActive ());

=== modified file 'launcher/Launcher.h'
--- launcher/Launcher.h	2012-08-31 20:13:12 +0000
+++ launcher/Launcher.h	2012-09-01 14:28:19 +0000
@@ -188,9 +188,6 @@
   void OnOptionChanged();
   void UpdateOptions(Options::Ptr options);
 
-  void OnWindowMapped(guint32 xid);
-  void OnWindowUnmapped(guint32 xid);
-
   void OnDragStart(const nux::GestureEvent &event);
   void OnDragUpdate(const nux::GestureEvent &event);
   void OnDragFinish(const nux::GestureEvent &event);

=== modified file 'launcher/LauncherDragWindow.cpp'
--- launcher/LauncherDragWindow.cpp	2012-08-31 20:13:37 +0000
+++ launcher/LauncherDragWindow.cpp	2012-09-01 14:28:19 +0000
@@ -24,6 +24,7 @@
 #include <Nux/TextureArea.h>
 
 #include "LauncherDragWindow.h"
+#include "unity-shared/WindowManager.h"
 
 namespace unity
 {
@@ -41,11 +42,12 @@
 
   key_down.connect([this] (unsigned long, unsigned long keysym, unsigned long, const char*, unsigned short) {
     if (keysym == NUX_VK_ESCAPE)
-    {
-      _cancelled = true;
-      drag_cancel_request.emit();
-    }
+      CancelDrag();
   });
+
+  auto wm = WindowManager::Default();
+  wm->window_mapped.connect(sigc::hide(sigc::mem_fun(this, &LauncherDragWindow::CancelDrag)));
+  wm->window_unmapped.connect(sigc::hide(sigc::mem_fun(this, &LauncherDragWindow::CancelDrag)));
 }
 
 LauncherDragWindow::~LauncherDragWindow()
@@ -66,6 +68,12 @@
   return _cancelled;
 }
 
+void LauncherDragWindow::CancelDrag()
+{
+  _cancelled = true;
+  drag_cancel_request.emit();
+}
+
 void LauncherDragWindow::SetAnimationTarget(int x, int y)
 {
   _animation_target = nux::Point2(x, y);

=== modified file 'launcher/LauncherDragWindow.h'
--- launcher/LauncherDragWindow.h	2012-08-31 14:40:17 +0000
+++ launcher/LauncherDragWindow.h	2012-09-01 14:28:19 +0000
@@ -57,6 +57,7 @@
 
 private:
   bool OnAnimationTimeout();
+  void CancelDrag();
 
   bool _cancelled;
   nux::ObjectPtr<nux::IOpenGLBaseTexture> _icon;

=== modified file 'tests/test_launcher.cpp'
--- tests/test_launcher.cpp	2012-08-31 20:14:18 +0000
+++ tests/test_launcher.cpp	2012-09-01 14:28:19 +0000
@@ -204,7 +204,7 @@
   EXPECT_EQ(launcher_->IconBackgroundIntensity(third, current), 0.0f);
 }
 
-TEST_F(TestLauncher, CancellingDragLauncherIcon)
+TEST_F(TestLauncher, DragLauncherIconCancelRestoresIconOrder)
 {
   MockMockLauncherIcon::Ptr icon1(new MockMockLauncherIcon);
   MockMockLauncherIcon::Ptr icon2(new MockMockLauncherIcon);

=== modified file 'tests/test_launcher_drag_window.cpp'
--- tests/test_launcher_drag_window.cpp	2012-08-31 20:14:18 +0000
+++ tests/test_launcher_drag_window.cpp	2012-09-01 14:28:19 +0000
@@ -20,6 +20,7 @@
 #include <gmock/gmock.h>
 
 #include "LauncherDragWindow.h"
+#include "WindowManager.h"
 
 using namespace unity::launcher;
 using namespace testing;
@@ -67,4 +68,24 @@
   EXPECT_TRUE(drag_window.Cancelled());
 }
 
+TEST_F(TestLauncherDragWindow, CancelsOnWindowMapped)
+{
+  bool got_signal;
+  drag_window.drag_cancel_request.connect([&got_signal] { got_signal = true; });
+  WindowManager::Default()->window_mapped.emit(0);
+
+  EXPECT_TRUE(got_signal);
+  EXPECT_TRUE(drag_window.Cancelled());
+}
+
+TEST_F(TestLauncherDragWindow, CancelsOnWindowUnmapped)
+{
+  bool got_signal;
+  drag_window.drag_cancel_request.connect([&got_signal] { got_signal = true; });
+  WindowManager::Default()->window_unmapped.emit(0);
+
+  EXPECT_TRUE(got_signal);
+  EXPECT_TRUE(drag_window.Cancelled());
+}
+
 }