Merge lp:~bitshifternz/unity/fix-for-bug-769781 into lp:unity

[Cameron Hart]

Checks the max size hint on the window before attempting to maximize. Also fixes memory leak.

[Tim Penhey (thumper)]

> Checks the max size hint on the window before attempting to maximize.

Looks reasonable to me, but I don't hold any weight just now :-)

[Sam Spilsbury (smspillaz)]

Approve, however being pedantic here, line 18 has weird indentation, you might want to fix that :)

Also, just for super-super-correctness, you might want to do the check against the window size minus the decorations geometry. So for that you'd have (screen_width - window->border ().left () - window->border ().right () > size_hints.max_width) ... if that makes any sense.

review: Approve

[Cameron Hart (bitshifternz)]

Cheers, I don't know what happened with that indentation. I'll fold in your other suggestion.

> Approve, however being pedantic here, line 18 has weird indentation, you might
> want to fix that :)
>
> Also, just for super-super-correctness, you might want to do the check against
> the window size minus the decorations geometry. So for that you'd have
> (screen_width - window->border ().left () - window->border ().right () >
> size_hints.max_width) ... if that makes any sense.

=== modified file 'src/PluginAdapter.cpp'
--- src/PluginAdapter.cpp	2011-04-18 17:56:31 +0000
+++ src/PluginAdapter.cpp	2011-04-24 08:41:02 +0000
@@ -580,7 +580,7 @@
 {
   XClassHint   classHint;
   Status       status;
-  char*        win_wmclass = NULL;
+  std::string  win_wmclass;
   int          num_monitor;
   CompOutput   screen;
   int          screen_width;
@@ -597,7 +597,7 @@
   status = XGetClassHint (m_Screen->dpy (), window->id (), &classHint);
   if (status && classHint.res_class)
   {
-    win_wmclass = strdup (classHint.res_class);
+	win_wmclass = classHint.res_class;
     XFree (classHint.res_class);
   }
   else
@@ -617,18 +617,17 @@
 
   // use server<parameter> because the window won't show the real parameter as
   // not mapped yet
+  const XSizeHints& hints = window->sizeHints ();
   covering_part = (float)(window->serverWidth () * window->serverHeight ()) / (float)(screen_width * screen_height);
-  if ((covering_part < COVERAGE_AREA_BEFORE_AUTOMAXIMIZE) || (covering_part > 1.0))
+  if ((covering_part < COVERAGE_AREA_BEFORE_AUTOMAXIMIZE) || (covering_part > 1.0) ||
+      (hints.flags & PMaxSize && (screen_width > hints.max_width || screen_height > hints.max_height)))
   {
-    g_debug ("MaximizeIfBigEnough: %s window size doesn't fit", win_wmclass);
+    g_debug ("MaximizeIfBigEnough: %s window size doesn't fit", win_wmclass.c_str());
     return;
   }
 
   Undecorate (window->id ());
   window->maximize (MAXIMIZE_STATE);
-
-  if (win_wmclass)
-    free (win_wmclass);
 }
 
 void