Merge lp:~jassmith/unity/unity.sru-fixes into lp:unity

[Jason Smith]

[Neil J. Patel (njpatel)]

review: Approve

=== modified file 'src/unityshell.cpp'
--- src/unityshell.cpp	2011-05-04 13:18:37 +0000
+++ src/unityshell.cpp	2011-05-26 15:17:26 +0000
@@ -676,11 +676,26 @@
   window->resizeNotify (x, y, w, h);
 }
 
+CompPoint
+UnityWindow::tryNotIntersectLauncher (CompPoint &pos)
+{
+  UnityScreen *us = UnityScreen::get (screen);
+  nux::Geometry geo = us->launcher->GetAbsoluteGeometry ();
+  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);
+  }
+  
+  return pos;
+}
+
 bool
 UnityWindow::place (CompPoint &pos)
 {
   UnityScreen *us = UnityScreen::get (screen);
-  nux::Geometry geo = us->launcher->GetAbsoluteGeometry ();
   Launcher::LauncherHideMode hideMode = us->launcher->GetHideMode ();
   
   bool result = window->place (pos);
@@ -689,11 +704,9 @@
   {
     case Launcher::LAUNCHER_HIDE_DODGE_WINDOWS:
     case Launcher::LAUNCHER_HIDE_DODGE_ACTIVE_WINDOW:
-      if (pos.x () <= geo.width && window->width () + geo.width + 1< screen->workArea ().width ())
-        {
-          pos.setX (geo.width + 1);
-        }
+      pos = tryNotIntersectLauncher (pos);
       break;
+    
     default:
       break;
   }
@@ -1057,6 +1070,8 @@
   self->launcher->SetLaunchAnimation (Launcher::LAUNCH_ANIMATION_PULSE);
   self->launcher->SetUrgentAnimation (Launcher::URGENT_ANIMATION_WIGGLE);
   self->ScheduleRelayout (0);
+  
+  self->OnLauncherHiddenChanged ();
 
   END_FUNCTION ();
 }

=== modified file 'src/unityshell.h'
--- src/unityshell.h	2011-04-26 22:11:36 +0000
+++ src/unityshell.h	2011-05-26 15:17:26 +0000
@@ -277,6 +277,8 @@
   void stateChangeNotify (unsigned int lastState);
 
   bool place (CompPoint &pos);
+  
+  CompPoint tryNotIntersectLauncher (CompPoint &pos);
 };
 
 #define EX_SCREEN (screen) \