Merge lp:~alexlauni/unity/window-placement into lp:unity

[Alex Launi]

Tries to ensure that new windows don't obscure the launcher. Behaves correctly for floating, and maximized windows.

[Jason Smith (jassmith)]

This could push a window slightly offscreen. You should ensure the new proposed position + the width of the window does not fall off the right edge of the screen.

review: Needs Fixing

[Jason Smith (jassmith)]

+1 looks good

review: Approve

=== modified file 'src/unityshell.cpp'
--- src/unityshell.cpp	2011-03-30 10:24:53 +0000
+++ src/unityshell.cpp	2011-03-30 17:04:31 +0000
@@ -567,6 +567,30 @@
   window->resizeNotify (x, y, w, h);
 }
 
+bool
+UnityWindow::place (CompPoint &pos)
+{
+  UnityScreen *us = UnityScreen::get (screen);
+  nux::Geometry geo = us->launcher->GetAbsoluteGeometry ();
+  Launcher::LauncherHideMode hideMode = us->launcher->GetHideMode ();
+
+  switch (hideMode)
+  {
+    case Launcher::LAUNCHER_HIDE_DODGE_WINDOWS:
+    case Launcher::LAUNCHER_HIDE_DODGE_ACTIVE_WINDOW:
+      if (pos.x () <= geo.width && window->width () + geo.width < screen->workArea ().width ())
+        {
+          pos.setX (geo.width);
+          return true;
+        }
+      break;
+    default:
+      break;
+  }
+
+  return false;
+}
+
 /* Configure callback for the launcher window */
 void
 UnityScreen::launcherWindowConfigureCallback(int WindowWidth, int WindowHeight, nux::Geometry& geo, void *user_data)

=== modified file 'src/unityshell.h'
--- src/unityshell.h	2011-03-30 10:39:59 +0000
+++ src/unityshell.h	2011-03-30 17:04:31 +0000
@@ -142,7 +142,7 @@
 
   void ScheduleRelayout (guint timeout);
 
-    protected:
+protected:
 
 	const gchar* GetName ();
 
@@ -255,6 +255,8 @@
   void resizeNotify (int x, int y, int w, int h);
   
   void stateChangeNotify (unsigned int lastState);
+
+  bool place (CompPoint &pos);
 };
 
 #define EX_SCREEN (screen) \