Merge lp:~3v1n0/unity/launcher-dnd-icon-damage-fix-5.0 into lp:unity/5.0

[Marco Trevisan (Treviño)]

unityshell: correctly damage the LauncherDragWindow region

Backported to unity 5.0 lp:~3v1n0/unity/launcher-dnd-icon-damage-fix/+merge/118142

[Andrea Azzarone (azzar1)]

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1005/console reported an error when processing this lp:~3v1n0/unity/launcher-dnd-icon-damage-fix-5.0 branch.
Not merging it.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1006/console reported an error when processing this lp:~3v1n0/unity/launcher-dnd-icon-damage-fix-5.0 branch.
Not merging it.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1008/console reported an error when processing this lp:~3v1n0/unity/launcher-dnd-icon-damage-fix-5.0 branch.
Not merging it.

[Unity Merger (unity-merger)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

[Brandon Schaefer (brandontschaefer)]

Fixed problem, and looks good! +1

review: Approve

=== modified file 'manual-tests/Launcher.txt'
--- manual-tests/Launcher.txt	2012-08-03 17:02:48 +0000
+++ manual-tests/Launcher.txt	2012-08-03 19:05:23 +0000
@@ -151,7 +151,7 @@
 
 
 Dragging icons to reorder - away from launcher
------------------------------------------
+----------------------------------------------
 This test is about reordering the icons without the animation showing.
 
 #. Move the mouse so it is over a launcher icon for an application
@@ -169,6 +169,22 @@
   it, and the any pips for running apps show again.
 
 
+Dragged launcher icons out of the launcher are properly drawn
+-------------------------------------------------------------
+This test ensures that the launcher icons out of the launcher are properly drawn
+
+Setup:
+
+Actions:
+#. Move the mouse so it is over a launcher icon for an application
+#. Press and hold the mouse button
+#. Drag the icon away from the launcher, in the middle of the display
+#. Don't move the mouse pointer for some (4-5) seconds, keeping the button pressed
+
+Expected Result:
+  * The icon is always drawn, even when the mouse pointer does not move.
+
+
 Dragging icon while program is starting
 ---------------------------------------
 This test that when a program is executed from the launcher and the icon is 

=== modified file 'plugins/unityshell/src/Launcher.cpp'
--- plugins/unityshell/src/Launcher.cpp	2012-08-03 17:02:48 +0000
+++ plugins/unityshell/src/Launcher.cpp	2012-08-03 19:05:23 +0000
@@ -1652,11 +1652,16 @@
   }
 }
 
-nux::ObjectPtr<nux::View> Launcher::GetActiveTooltip() const
+nux::ObjectPtr<nux::View> const& Launcher::GetActiveTooltip() const
 {
   return _active_tooltip;
 }
 
+nux::ObjectPtr<LauncherDragWindow> Launcher::GetDraggedIcon() const
+{
+  return nux::ObjectPtr<LauncherDragWindow>(_drag_window);
+}
+
 void
 Launcher::SetActionState(LauncherActionState actionstate)
 {

=== modified file 'plugins/unityshell/src/Launcher.h'
--- plugins/unityshell/src/Launcher.h	2012-08-03 17:02:48 +0000
+++ plugins/unityshell/src/Launcher.h	2012-08-03 19:05:23 +0000
@@ -99,7 +99,8 @@
     return _parent;
   };
 
-  nux::ObjectPtr<nux::View> GetActiveTooltip() const;  // nullptr = no tooltip
+  nux::ObjectPtr<nux::View> const& GetActiveTooltip() const;
+  nux::ObjectPtr<LauncherDragWindow> GetDraggedIcon() const;
 
   virtual void RecvMouseUp(int x, int y, unsigned long button_flags, unsigned long key_flags);
   virtual void RecvMouseDown(int x, int y, unsigned long button_flags, unsigned long key_flags);

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-08-01 00:53:24 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-08-03 19:05:23 +0000
@@ -1429,31 +1429,48 @@
     }
   }
 
-  auto launchers = launcher_controller_->launchers();
-  for (auto launcher : launchers)
+  auto const& launchers = launcher_controller_->launchers();
+  for (auto const& launcher : launchers)
   {
     if (!launcher->Hidden())
     {
-      nux::Geometry geo = launcher->GetAbsoluteGeometry();
+      nux::Geometry const& geo = launcher->GetAbsoluteGeometry();
       CompRegion launcher_region(geo.x, geo.y, geo.width, geo.height);
+
       if (damage.intersects(launcher_region))
         launcher->QueueDraw();
-      nux::ObjectPtr<nux::View> tooltip = launcher->GetActiveTooltip();
-      if (!tooltip.IsNull())
+
+      nux::ObjectPtr<nux::View> const& tooltip = launcher->GetActiveTooltip();
+
+      if (tooltip)
       {
-        nux::Geometry tip = tooltip->GetAbsoluteGeometry();
-        CompRegion tip_region(tip.x, tip.y, tip.width, tip.height);
+        nux::Geometry const& g = tooltip->GetAbsoluteGeometry();
+        CompRegion tip_region(g.x, g.y, g.width, g.height);
+
         if (damage.intersects(tip_region))
           tooltip->QueueDraw();
       }
+
+      nux::ObjectPtr<LauncherDragWindow> const& dragged_icon = launcher->GetDraggedIcon();
+
+      if (dragged_icon)
+      {
+        nux::Geometry const& g = dragged_icon->GetAbsoluteGeometry();
+        CompRegion icon_region(g.x, g.y, g.width, g.height);
+
+        if (damage.intersects(icon_region))
+          dragged_icon->QueueDraw();
+      }
     }
   }
 
   std::vector<nux::View*> const& panels(panel_controller_->GetPanelViews());
   for (nux::View* view : panels)
   {
-    nux::Geometry geo = view->GetAbsoluteGeometry();
+    nux::Geometry const& geo = view->GetAbsoluteGeometry();
+
     CompRegion panel_region(geo.x, geo.y, geo.width, geo.height);
+
     if (damage.intersects(panel_region))
       view->QueueDraw();
   }
@@ -1464,8 +1481,9 @@
     QuicklistView* view = qm->Current();
     if (view)
     {
-      nux::Geometry geo = view->GetAbsoluteGeometry();
+      nux::Geometry const& geo = view->GetAbsoluteGeometry();
       CompRegion quicklist_region(geo.x, geo.y, geo.width, geo.height);
+
       if (damage.intersects(quicklist_region))
         view->QueueDraw();
     }
@@ -1488,7 +1506,8 @@
   CompRegion nux_damage;
 
   std::vector<nux::Geometry> const& dirty = wt->GetDrawList();
-  for (auto geo : dirty)
+
+  for (auto const& geo : dirty)
     nux_damage += CompRegion(geo.x, geo.y, geo.width, geo.height);
 
   if (launcher_controller_->IsOverlayOpen())
@@ -1498,17 +1517,26 @@
     nux_damage += CompRegion(geo.x, geo.y, geo.width, geo.height);
   }
 
-  auto launchers = launcher_controller_->launchers();
-  for (auto launcher : launchers)
+  auto const& launchers = launcher_controller_->launchers();
+  for (auto const& launcher : launchers)
   {
     if (!launcher->Hidden())
     {
       nux::ObjectPtr<nux::View> tooltip = launcher->GetActiveTooltip();
-      if (!tooltip.IsNull())
+
+      if (tooltip)
       {
         nux::Geometry const& g = tooltip->GetAbsoluteGeometry();
         nux_damage += CompRegion(g.x, g.y, g.width, g.height);
       }
+
+      nux::ObjectPtr<LauncherDragWindow> const& dragged_icon = launcher->GetDraggedIcon();
+
+      if (dragged_icon)
+      {
+        nux::Geometry const& g = dragged_icon->GetAbsoluteGeometry();
+        nux_damage += CompRegion(g.x, g.y, g.width, g.height);
+      }
     }
   }