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

[Sam Spilsbury]

Fix bug 868930

[Tim Penhey (thumper)]

How about:

  bool maximized = PluginAdapter::Default()->MaximizeIfBigEnough(window);
  if (!maximized)

I find this easier to read, and the compiler will optimise the temporary out.

review: Approve (conditional)

=== modified file 'plugins/unityshell/src/PluginAdapter.cpp'
--- plugins/unityshell/src/PluginAdapter.cpp	2011-10-01 06:15:51 +0000
+++ plugins/unityshell/src/PluginAdapter.cpp	2011-10-07 02:39:25 +0000
@@ -190,9 +190,6 @@
     case CompWindowNotifyUnmap:
       WindowManager::window_unmapped.emit(window->id());
       break;
-    case CompWindowNotifyReparent:
-      MaximizeIfBigEnough(window);
-      break;
     case CompWindowNotifyFocusChange:
       WindowManager::window_focus_changed.emit(window->id());
       break;
@@ -842,7 +839,8 @@
   return _vp_switch_started;
 }
 
-void PluginAdapter::MaximizeIfBigEnough(CompWindow* window)
+/* Returns true if the window was maximized */
+bool PluginAdapter::MaximizeIfBigEnough(CompWindow* window)
 {
   XClassHint   classHint;
   Status       status;
@@ -854,14 +852,14 @@
   float        covering_part;
 
   if (!window)
-    return;
+    return false;
 
   if ((window->state() & MAXIMIZE_STATE) == MAXIMIZE_STATE)
-    return;
+    return false;
 
   if (window->type() != CompWindowTypeNormalMask
       || (window->actions() & MAXIMIZABLE) != MAXIMIZABLE)
-    return;
+    return false;
 
   status = XGetClassHint(m_Screen->dpy(), window->id(), &classHint);
   if (status && classHint.res_class)
@@ -873,7 +871,7 @@
       XFree(classHint.res_name);
   }
   else
-    return;
+    return false;
 
   num_monitor = window->outputDevice();
   CompOutput &o = m_Screen->outputDevs().at(num_monitor);
@@ -889,10 +887,12 @@
       (hints.flags & PMaxSize && (screen_width > hints.max_width || screen_height > hints.max_height)))
   {
     LOG_DEBUG(logger) << win_wmclass << " window size doesn't fit";
-    return;
+    return false;
   }
 
   window->maximize(MAXIMIZE_STATE);
+
+  return true;
 }
 
 void

=== modified file 'plugins/unityshell/src/PluginAdapter.h'
--- plugins/unityshell/src/PluginAdapter.h	2011-10-01 06:15:51 +0000
+++ plugins/unityshell/src/PluginAdapter.h	2011-10-07 02:39:25 +0000
@@ -135,7 +135,7 @@
 
   unsigned long long GetWindowActiveNumber (guint32 xid);
 
-  void MaximizeIfBigEnough(CompWindow* window);
+  bool MaximizeIfBigEnough(CompWindow* window);
 
   nux::Geometry GetWindowGeometry(guint32 xid);
   nux::Geometry GetScreenGeometry();

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2011-10-05 09:03:44 +0000
+++ plugins/unityshell/src/unityshell.cpp	2011-10-07 02:39:25 +0000
@@ -1890,13 +1890,20 @@
 
 bool UnityWindow::place(CompPoint& pos)
 {
-  bool result = window->place(pos);
-
-  if (window->type() & NO_FOCUS_MASK)
+  bool was_maximized = PluginAdapter::Default ()->MaximizeIfBigEnough(window);
+
+  if (!was_maximized)
+  {
+    bool result = window->place(pos);
+
+    if (window->type() & NO_FOCUS_MASK)
+      return result;
+
+    pos = tryNotIntersectUI(pos);
     return result;
+  }
 
-  pos = tryNotIntersectUI(pos);
-  return result;
+  return true;
 }
 
 /* Configure callback for the launcher window */