Merge lp:~vanvugt/compiz-core/fix-924736 into lp:compiz-core

[Daniel van Vugt]

Fix semi-maximized windows missing borders or shadows (LP: #924736).

[Sam Spilsbury (smspillaz)]

Design has requested that semi maximized windows have maximized-like borders iirc.

Actually the bug that was causing them not to get shadows in the first place was that there was a typo where maximized windows were being given an invalid shadow context. That's fixed in my other branch

8 - &frame->max_border_shadow_inactive,
9 + &frame->max_border_shadow_active,

[Daniel van Vugt (vanvugt)]

I don't think "design" fully understands the question and the implications of this particular bug.

[Daniel van Vugt (vanvugt)]

This fix makes semi-maximized windows look exactly like they do in oneiric. Isn't that what we want?

[Sam Spilsbury (smspillaz)]

Not really, I remember asking John about this a while ago and he told me that semi maximized windows should effectively behave and look like maximized windows (but obviously need to have a shadow).

Like I said, I'll double check.

[Daniel van Vugt (vanvugt)]

I just checked the source for unity-window-decorator and it already contains this fix (obviously never backported to gtk-window-decorator yet).

[Daniel van Vugt (vanvugt)]

Removed the comment about the assertion. I can't reproduce the assertion any more. It's obviously not caused by this fix.

[Tim Penhey (thumper)]

Code seems sound.

review: Approve

=== modified file 'gtk/window-decorator/metacity.c'
--- gtk/window-decorator/metacity.c	2012-01-12 06:48:58 +0000
+++ gtk/window-decorator/metacity.c	2012-02-16 07:03:23 +0000
@@ -521,7 +521,7 @@
     if (d->active)
 	*flags |= (MetaFrameFlags ) META_FRAME_HAS_FOCUS;
 
-    if ((d->state & META_MAXIMIZED))
+    if ((d->state & META_MAXIMIZED) == META_MAXIMIZED)
 	*flags |= (MetaFrameFlags ) META_FRAME_MAXIMIZED;
 
     if (d->state & WNCK_WINDOW_STATE_STICKY)
@@ -1142,7 +1142,7 @@
     decor_context_t *context;
     decor_shadow_t  *shadow;
 
-    if ((d->state & META_MAXIMIZED))
+    if ((d->state & META_MAXIMIZED) == META_MAXIMIZED)
     {
 	if (!d->frame_window)
 	{
@@ -1206,7 +1206,7 @@
     }
     else
     {
-	if ((d->state & META_MAXIMIZED))
+	if ((d->state & META_MAXIMIZED) == META_MAXIMIZED)
 	    decor_get_default_layout (context, d->client_width,
 				      d->client_height - d->frame->titlebar_height,
 				      &layout);