Merge lp:~smspillaz/unity/unity.fix_857214 into lp:unity

[Sam Spilsbury]

Fix bug 857214

=== modified file 'plugins/unityshell/src/PanelController.cpp'
--- plugins/unityshell/src/PanelController.cpp	2011-09-07 21:00:32 +0000
+++ plugins/unityshell/src/PanelController.cpp	2011-09-28 12:34:03 +0000
@@ -60,6 +60,18 @@
     return 0;
 }
 
+std::list <nux::Geometry> PanelController::GetGeometries ()
+{
+  std::list <nux::Geometry> geometries;
+
+  for (auto &window : _windows)
+  {
+    geometries.push_back (window->GetAbsoluteGeometry ());
+  }
+
+  return geometries;
+}
+
 void
 PanelController::StartFirstMenuShow()
 {

=== modified file 'plugins/unityshell/src/PanelController.h'
--- plugins/unityshell/src/PanelController.h	2011-09-07 21:00:32 +0000
+++ plugins/unityshell/src/PanelController.h	2011-09-28 12:34:03 +0000
@@ -38,6 +38,7 @@
   void QueueRedraw();
 
   unsigned int GetTrayXid ();
+  std::list <nux::Geometry> GetGeometries ();
 
   float opacity() const;
 

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2011-09-28 01:43:32 +0000
+++ plugins/unityshell/src/unityshell.cpp	2011-09-28 12:34:03 +0000
@@ -1738,16 +1738,79 @@
   window->resizeNotify(x, y, w, h);
 }
 
-CompPoint UnityWindow::tryNotIntersectLauncher(CompPoint& pos)
+CompPoint UnityWindow::tryNotIntersectUI(CompPoint& pos)
 {
   UnityScreen* us = UnityScreen::get(screen);
+  Launcher::LauncherHideMode hideMode = us->launcher->GetHideMode();
   nux::Geometry geo = us->launcher->GetAbsoluteGeometry();
+  CompRegion allowedWorkArea (screen->workArea ());
   CompRect launcherGeo(geo.x, geo.y, geo.width, geo.height);
-
-  if (launcherGeo.contains(pos))
-  {
-    if (screen->workArea().contains(CompRect(launcherGeo.right() + 1, pos.y(), window->width(), window->height())))
-      pos.setX(launcherGeo.right() + 1);
+  CompRegion wRegion (window->borderRect ());
+  CompRegion intRegion;
+
+  wRegion.translate (pos.x () - wRegion.boundingRect ().x (),
+                     pos.y () - wRegion.boundingRect ().y ());
+
+  /* subtract launcher and panel geometries from allowed workarea */
+  if (!us->launcher->Hidden ())
+  {
+    switch (hideMode)
+    {
+      case Launcher::LAUNCHER_HIDE_DODGE_WINDOWS:
+      case Launcher::LAUNCHER_HIDE_DODGE_ACTIVE_WINDOW:
+        allowedWorkArea -= launcherGeo;
+        break;
+
+      default:
+        break;
+    }
+  }
+
+  for (nux::Geometry &g : us->panelController->GetGeometries ())
+  {
+    CompRect pg (g.x, g.y, g.width, g.height);
+    allowedWorkArea -= pg;
+  }
+
+  /* Invert allowed work area */
+  allowedWorkArea = CompRegion (screen->workArea ()) - allowedWorkArea;
+
+  /* Now intersect the window region with the allowed work area
+   * region, such that it splits up into a number of rects */
+  intRegion = wRegion.intersected (allowedWorkArea);
+
+  if (intRegion.rects ().size () > 1)
+  {
+    /* Now find the largest rect, this will be the area that we want to move to */
+    CompRect largest;
+
+    for (CompRect &r : intRegion.rects ())
+    {
+      if (r.area () > largest.area ())
+        largest = r;
+    }
+
+    /* Now pad the largest rect with the other rectangles that
+     * were intersecting, padding the opposite side to the one
+     * that they are currently on on the large rect
+     */
+
+    intRegion -= largest;
+
+    for (CompRect &r : intRegion.rects ())
+    {
+      if (r.x1 () > largest.x2 ())
+        largest.setX (largest.x () - r.width ());
+      else if (r.x2 () < largest.x ())
+        largest.setWidth (largest.width () + r.width ());
+
+      if (r.y1 () > largest.y2 ())
+        largest.setY (largest.y () - r.height ());
+      else if (r.y2 () < largest.y ())
+        largest.setWidth (largest.height () + r.height ());
+    }
+
+    pos = largest.pos ();
   }
 
   return pos;
@@ -1755,21 +1818,9 @@
 
 bool UnityWindow::place(CompPoint& pos)
 {
-  UnityScreen* us = UnityScreen::get(screen);
-  Launcher::LauncherHideMode hideMode = us->launcher->GetHideMode();
-
   bool result = window->place(pos);
 
-  switch (hideMode)
-  {
-    case Launcher::LAUNCHER_HIDE_DODGE_WINDOWS:
-    case Launcher::LAUNCHER_HIDE_DODGE_ACTIVE_WINDOW:
-      pos = tryNotIntersectLauncher(pos);
-      break;
-
-    default:
-      break;
-  }
+  pos = tryNotIntersectUI(pos);
 
   return result;
 }

=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2011-09-21 03:40:33 +0000
+++ plugins/unityshell/src/unityshell.h	2011-09-28 12:34:03 +0000
@@ -382,7 +382,7 @@
   void stateChangeNotify(unsigned int lastState);
 
   bool place(CompPoint& pos);
-  CompPoint tryNotIntersectLauncher(CompPoint& pos);
+  CompPoint tryNotIntersectUI(CompPoint& pos);
 
   void paintThumbnail (nux::Geometry const& bounding, float alpha);