Merge lp:~unity-team/unity/trusty-1349281 into lp:unity/7.2

[Stephen M. Webb]

LayoutSystem: make sure the exposed open windows are displayed in the preserved order

LayoutSystem: make sure the exposed open windows are displayed in the "correct" order

In expose mode the windows were placed in z-order starting by the top-most window that was always put in the bottom right corner. After the change the windows are placed in a similar order to their initial one.

This change is cherry-picked from trunk for SRUing into Ubuntu 14.04 LTS.

Unmerged revisions

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-26 13:49:00 +0000
+++ debian/changelog	2014-12-09 14:10:31 +0000
@@ -1,3 +1,10 @@
+unity (7.2.3+14.04.20140826-0ubuntu2) UNRELEASED; urgency=medium
+
+  * LayoutSystem: make sure the exposed open windows are displayed in the
+    preserved order (lp: #1349281).
+
+ -- Eleni Maria Stea <[e-mail]>  Tue, 09 Dec 2014 09:05:01 -0500
+
 unity (7.2.3+14.04.20140826-0ubuntu1) trusty; urgency=medium
 
   [ Andrea Azzarone ]

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2014-08-06 14:19:10 +0000
+++ plugins/unityshell/src/unityshell.cpp	2014-12-09 14:10:31 +0000
@@ -3715,7 +3715,6 @@
     }
 
     auto max_bounds = NuxGeometryFromCompRect(output.workArea());
-
     if (launcher_controller_->options()->hide_mode != LAUNCHER_HIDE_NEVER)
     {
       int monitor_width = unity_settings_.LauncherWidth(monitor);
@@ -3729,19 +3728,18 @@
     layout.spacing = local::SCALE_SPACING.CP(monitor_scale);
     int padding = local::SCALE_PADDING.CP(monitor_scale);
     max_bounds.Expand(-padding, -padding);
-    layout.LayoutWindows(layout_windows, max_bounds, final_bounds);
+    layout.LayoutWindowsNearest(layout_windows, max_bounds, final_bounds);
 
-    auto lw_it = layout_windows.begin();
-    for (auto const& sw : scaled_windows)
+    for (auto const& lw : layout_windows)
     {
-      if (lw_it == layout_windows.end())
-        break;
-
-      LayoutWindow::Ptr const& lw = *lw_it;
-
-      if (sw->window->id() != lw->xid)
+      auto sw_it = std::find_if(scaled_windows.begin(), scaled_windows.end(), [&lw] (ScaleWindow* sw) {
+        return sw->window->id() == lw->xid;
+      });
+
+      if (sw_it == scaled_windows.end())
         continue;
 
+      ScaleWindow* sw = *sw_it;
       ScaleSlot slot(CompRectFromNuxGeo(lw->result));
       slot.scale = lw->scale;
 
@@ -3758,7 +3756,6 @@
       slot.filled = true;
 
       sw->setSlot(slot);
-      ++lw_it;
     }
   }
 

=== modified file 'unity-shared/LayoutSystem.cpp'
--- unity-shared/LayoutSystem.cpp	2014-03-10 13:17:01 +0000
+++ unity-shared/LayoutSystem.cpp	2014-12-09 14:10:31 +0000
@@ -32,7 +32,33 @@
   if (windows.empty())
     return;
 
-  LayoutGridWindows(windows, max_bounds, final_bounds);
+  LayoutGridWindows(windows, GetRows(windows, max_bounds), max_bounds, final_bounds);
+}
+
+void LayoutSystem::LayoutWindowsNearest(LayoutWindow::Vector& windows, nux::Geometry const& max_bounds, nux::Geometry& final_bounds)
+{
+  if (windows.empty())
+    return;
+
+  std::stable_sort(windows.begin(), windows.end(), [](LayoutWindow::Ptr const& a, LayoutWindow::Ptr const& b) {
+    return a->geo.y < b->geo.y;
+  });
+
+  std::vector<LayoutWindow::Vector> rows = GetRows(windows, max_bounds);
+  LayoutWindow::Vector ordered_windows;
+
+  for (auto& row : rows)
+  {
+    std::stable_sort(row.begin(), row.end(), [](LayoutWindow::Ptr const& a, LayoutWindow::Ptr const& b) {
+      return (a->geo.x + a->geo.width / 2) < (b->geo.x + b->geo.width / 2);
+    });
+
+    for (auto const& win : row)
+      ordered_windows.push_back(win);
+  }
+
+  LayoutGridWindows(ordered_windows, rows, max_bounds, final_bounds);
+  windows = ordered_windows;
 }
 
 nux::Size LayoutSystem::GridSizeForWindows(LayoutWindow::Vector const& windows, nux::Geometry const& max_bounds) const
@@ -229,10 +255,8 @@
   return rows;
 }
 
-void LayoutSystem::LayoutGridWindows(LayoutWindow::Vector const& windows, nux::Geometry const& max_bounds, nux::Geometry& final_bounds)
+void LayoutSystem::LayoutGridWindows(LayoutWindow::Vector const& windows, std::vector<LayoutWindow::Vector> const& rows, nux::Geometry const& max_bounds, nux::Geometry& final_bounds)
 {
-  std::vector<LayoutWindow::Vector> const& rows = GetRows(windows, max_bounds);
-
   int height = rows.size();
   int non_spacing_height = max_bounds.height - ((height - 1) * spacing);
   int row_height = std::min (max_row_height(), non_spacing_height / height);

=== modified file 'unity-shared/LayoutSystem.h'
--- unity-shared/LayoutSystem.h	2014-03-10 13:17:01 +0000
+++ unity-shared/LayoutSystem.h	2014-12-09 14:10:31 +0000
@@ -64,10 +64,11 @@
   LayoutSystem();
 
   void LayoutWindows(LayoutWindow::Vector const& windows, nux::Geometry const& max_bounds, nux::Geometry& final_bounds);
+  void LayoutWindowsNearest(LayoutWindow::Vector& windows, nux::Geometry const& max_bounds, nux::Geometry& final_bounds);
   std::vector<int> GetRowSizes(LayoutWindow::Vector const& windows, nux::Geometry const& max_bounds) const;
 
 protected:
-  void LayoutGridWindows(LayoutWindow::Vector const& windows, nux::Geometry const& max_bounds, nux::Geometry& final_bounds);
+  void LayoutGridWindows(LayoutWindow::Vector const& windows, std::vector<LayoutWindow::Vector> const& rows, nux::Geometry const& max_bounds, nux::Geometry& final_bounds);
 
   nux::Geometry LayoutRow(LayoutWindow::Vector const& row, nux::Geometry const& row_bounds);
   nux::Geometry CompressAndPadRow(LayoutWindow::Vector const& windows, nux::Geometry const& max_bounds);