Merge lp:~3v1n0/unity/launcher-dragwindow-ordering-rewrite into lp:unity

[Marco Trevisan (Treviño)]

Launcher: make always possible to drag an icon to the bottom or top of its sublist

It was not possible before to reorder application icons below the BFB or above the workspace switcher

The code to reorder icons when one was dragged was messy and bugged, so I've rewritten it to improve it and to fix some issues that made impossible (for example) to re-order an icon at the end or at the bottom of an icons sublist (i.e. a list of icons of the same type).

Manual tests updated.

[Brandon Schaefer (brandontschaefer)]

Awesome, now works :).

review: Approve

=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2012-08-30 22:29:18 +0000
+++ launcher/Launcher.cpp	2012-08-30 22:29:18 +0000
@@ -2088,59 +2088,54 @@
 
 void Launcher::UpdateDragWindowPosition(int x, int y)
 {
-  if (_drag_window)
-  {
-    nux::Geometry const& geo = _drag_window->GetGeometry();
-    _drag_window->SetBaseXY(x - geo.width / 2, y - geo.height / 2);
-
-    AbstractLauncherIcon::Ptr hovered_icon = MouseIconIntersection((int)((GetGeometry().x + GetGeometry().width) / 2.0f), y - GetAbsoluteGeometry().y);
-
-    struct timespec current;
-    clock_gettime(CLOCK_MONOTONIC, &current);
-    if (_drag_icon && hovered_icon && _drag_icon != hovered_icon)
-    {
-      float progress = DragThresholdProgress(current);
-
-      if (progress >= 1.0f)
-        _model->ReorderSmart(_drag_icon, hovered_icon, true);
-      else if (progress == 0.0f) {
-        if (_drag_icon->GetIconType() == hovered_icon->GetIconType()) {
-          _model->ReorderBefore(_drag_icon, hovered_icon, false);
-        } else {
-          // LauncherModel::ReorderBefore does not work on different icon types
-          // so if hovered_icon is of a different type than _drag_icon
-          // try to use LauncherModel::ReorderAfter with the icon that is before hovered_icon
-          AbstractLauncherIcon::Ptr iconBeforeHover;
-          LauncherModel::iterator it;
-          LauncherModel::iterator prevIt = _model->end();
-          for (it = _model->begin(); it != _model->end(); ++it)
-          {
-            if (!(*it)->GetQuirk(AbstractLauncherIcon::Quirk::VISIBLE) || !(*it)->IsVisibleOnMonitor(monitor))
-              continue;
-
-            if ((*it) == hovered_icon) {
-              if (prevIt != _model->end()) {
-                iconBeforeHover = *prevIt;
-              }
-              break;
-            }
-
-            prevIt = it;
-          }
-
-          if (iconBeforeHover && _drag_icon != iconBeforeHover) {
-            _model->ReorderAfter(_drag_icon, iconBeforeHover);
-          }
-        }
-      }
-
-      if (progress >= 1.0f)
-      {
-        _model->ReorderSmart(_drag_icon, hovered_icon, true);
-      }
-      else if (progress == 0.0f)
-      {
-        _model->ReorderBefore(_drag_icon, hovered_icon, false);
+  if (!_drag_window)
+    return;
+
+  auto const& icon_geo = _drag_window->GetGeometry();
+  _drag_window->SetBaseXY(x - icon_geo.width / 2, y - icon_geo.height / 2);
+
+  if (!_drag_icon)
+    return;
+
+  auto const& launcher_geo = GetGeometry();
+  auto hovered_icon = MouseIconIntersection((launcher_geo.x + launcher_geo.width) / 2.0, y - GetAbsoluteY());
+  struct timespec current;
+  clock_gettime(CLOCK_MONOTONIC, &current);
+  float progress = DragThresholdProgress(current);
+
+  // Icons of different types can't be mixed, so let's avoid this.
+  if (hovered_icon && hovered_icon->GetIconType() != _drag_icon->GetIconType())
+    hovered_icon = nullptr;
+
+  if (hovered_icon && _drag_icon != hovered_icon)
+  {
+    if (progress >= 1.0f)
+    {
+      _model->ReorderSmart(_drag_icon, hovered_icon, true);
+    }
+    else if (progress == 0.0f)
+    {
+      _model->ReorderBefore(_drag_icon, hovered_icon, false);
+    }
+  }
+  else if (!hovered_icon && progress == 0.0f)
+  {
+    // If no icon is hovered, then we can add our icon to the bottom
+    for (auto it = _model->main_rbegin(); it != _model->main_rend(); ++it)
+    {
+      auto const& icon = *it;
+
+      if (!icon->GetQuirk(AbstractLauncherIcon::Quirk::VISIBLE) ||
+          !icon->IsVisibleOnMonitor(monitor) ||
+          icon->GetIconType() != _drag_icon->GetIconType())
+      {
+        continue;
+      }
+
+      if (y >= icon->GetCenter(monitor).y)
+      {
+        _model->ReorderAfter(_drag_icon, icon);
+        break;
       }
     }
   }

=== modified file 'manual-tests/Launcher.txt'
--- manual-tests/Launcher.txt	2012-08-21 17:50:55 +0000
+++ manual-tests/Launcher.txt	2012-08-30 22:29:18 +0000
@@ -124,6 +124,7 @@
 launcher, and that the animation is smooth.
 
 Setup:
+#. Ensure that you have multiple applications running or pinned to the launcher
 
 Actions:
 #. Move mouse pointer over an application or device icon (not BFB, Workspace switcher or trash)
@@ -142,6 +143,7 @@
 This test is all position of the dragged image in relation to the mouse pointer.
 
 Setup:
+#. Ensure that you have multiple applications running or pinned to the launcher
 
 Actions:
 #. Move the mouse so it is over a launcher icon for an application
@@ -160,6 +162,7 @@
 of icons in the launcher.
 
 Setup:
+#. Ensure that you have multiple applications running or pinned to the launcher
 
 Actions:
 #. Move the mouse so it is over a launcher icon for an application
@@ -167,13 +170,15 @@
 #. Drag the icon up and down over the icons in the launcher
 
 Expected Result:
-  * As the centre of the dragged icon passes the mid-point of the next item
-  above or below it, the icon being dragged over moves and is replaced by the
-  blank "space".
+  * As the center of the dragged icon passes the mid-point of the next item
+    above or below it, the icon being dragged over moves and is replaced by the
+    blank "space".
   * The animation should be smooth
   * If the dragged icon is moved rapidly, multiple icons can be moving either
-  upwards or downwards as the space is moved into place under the dragged icon
-  * The BFB and the switcher icons do not move
+    upwards or downwards as the space is moved into place under the dragged icon
+  * Dragging the second application icon (the third icon of the launcher) below
+    the BFB or above the workspace switcher should be possible.
+  * The BFB and the workspace switcher icons do not move
 
 
 Dragging icons to reorder - away from launcher
@@ -181,6 +186,7 @@
 This test is about reordering the icons without the animation showing.
 
 Setup:
+#. Ensure that you have multiple applications running or pinned to the launcher
 
 Actions:
 #. Move the mouse so it is over a launcher icon for an application
@@ -193,7 +199,7 @@
   * As the icon is dragged away from the launcher, the "space" is closed up
   and replaced with a grey line.
   * As the icon is dragged up and down, the line moves between other launcher
-  icons.
+  icons of the same type.
   * When released, the icon "flies" back into the launcher, a spaces opens for
   it, and the any pips for running apps show again.
 
@@ -203,6 +209,7 @@
 This test ensures that the launcher icons out of the launcher are properly drawn
 
 Setup:
+#. Ensure that you have multiple applications running or pinned to the launcher
 
 Actions:
 #. Move the mouse so it is over a launcher icon for an application