Merge lp:~compiz-team/compiz-core/oneiric.fix_796594-n into lp:compiz-core/oneiric

[Sam Spilsbury]

Fix bug 796594

[lp:~compiz-team/compiz-core/oneiric.fix_796594-n]

2822. By Sam Spilsbury on 2011-09-30

Remove debug message

[Jason Smith (jassmith)]

review: Approve

=== modified file 'plugins/decor/src/decor.cpp'
--- plugins/decor/src/decor.cpp	2011-09-29 04:01:56 +0000
+++ plugins/decor/src/decor.cpp	2011-09-30 02:01:23 +0000
@@ -928,7 +928,7 @@
 	if (!wd)
 	    return false;
 
-	if ((window->state () & MAXIMIZE_STATE) == MAXIMIZE_STATE)
+	if ((window->state () & MAXIMIZE_STATE))
 	    window->setWindowFrameExtents (&wd->decor->maxBorder,
 					   &wd->decor->maxInput);
 	else if (!window->hasUnmapReference ())
@@ -1078,7 +1078,7 @@
     else
 	parent = window->frame ();
 
-    if ((window->state () & MAXIMIZE_STATE) == MAXIMIZE_STATE)
+    if ((window->state () & MAXIMIZE_STATE))
     {
 	border = wd->decor->maxBorder;
 	input = wd->decor->maxInput;
@@ -1208,7 +1208,7 @@
     int                  bw = server.border () * 2;
     CompWindowExtents	 input;
 
-    if ((window->state () & MAXIMIZE_STATE) == MAXIMIZE_STATE)
+    if ((window->state () & MAXIMIZE_STATE))
 	input = wd->decor->maxInput;
     else
 	input = wd->decor->input;
@@ -1995,37 +1995,36 @@
 void
 DecorWindow::stateChangeNotify (unsigned int lastState)
 {
-    if (!update (true))
+    if (wd && wd->decor)
     {
-	if (wd && wd->decor)
+	int oldShiftX = shiftX ();
+	int oldShiftY = shiftY ();
+	int moveDx, moveDy;
+
+	if ((window->state () & MAXIMIZE_STATE))
 	{
-	    int oldShiftX = shiftX ();
-	    int oldShiftY = shiftY ();
-	    int moveDx, moveDy;
-
-	    if ((window->state () & MAXIMIZE_STATE) == MAXIMIZE_STATE)
-		window->setWindowFrameExtents (&wd->decor->maxBorder,
-					       &wd->decor->maxInput);
-	    else
-		window->setWindowFrameExtents (&wd->decor->border,
-					       &wd->decor->input);
-
-	    /* Since we immediately update the frame extents, we must
-	     * also update the stored saved window geometry in order
-	     * to prevent the window from shifting back too far once
-	     * unmaximized */
-
-	    moveDx = shiftX () - oldShiftX;
-	    moveDy = shiftY () - oldShiftY;
-
-	    if (window->saveMask () & CWX)
-		window->saveWc ().x += moveDx;
-
-	    if (window->saveMask () & CWY)
-		window->saveWc ().y += moveDy;
-
-	    updateFrame ();
+	    window->setWindowFrameExtents (&wd->decor->maxBorder,
+				           &wd->decor->maxInput);
 	}
+	else
+	    window->setWindowFrameExtents (&wd->decor->border,
+				           &wd->decor->input);
+
+	/* Since we immediately update the frame extents, we must
+	* also update the stored saved window geometry in order
+	* to prevent the window from shifting back too far once
+	* unmaximized */
+
+	moveDx = shiftX () - oldShiftX;
+	moveDy = shiftY () - oldShiftY;
+
+	if (window->saveMask () & CWX)
+	    window->saveWc ().x += moveDx;
+
+	if (window->saveMask () & CWY)
+	    window->saveWc ().y += moveDy;
+
+	updateFrame ();
     }
 
     window->stateChangeNotify (lastState);

=== modified file 'src/window.cpp'
--- src/window.cpp	2011-09-29 04:01:56 +0000
+++ src/window.cpp	2011-09-30 02:01:23 +0000
@@ -3463,8 +3463,8 @@
 	{
 	    saveGeometry (CWY | CWHeight);
 
-	    xwc->height = workArea.height () - serverInput.top -
-			  serverInput.bottom - old.border () * 2;
+	    xwc->height = workArea.height () - border.top -
+			  border.bottom - old.border () * 2;
 
 	    mask |= CWHeight;
 	}
@@ -3477,8 +3477,8 @@
 	{
 	    saveGeometry (CWX | CWWidth);
 
-	    xwc->width = workArea.width () - serverInput.left -
-			 serverInput.right - old.border () * 2;
+	    xwc->width = workArea.width () - border.left -
+			 border.right - old.border () * 2;
 
 	    mask |= CWWidth;
 	}
@@ -3545,9 +3545,9 @@
 
 	    if (state & CompWindowStateMaximizedVertMask)
 	    {
-		if (old.y () < y + workArea.y () + serverInput.top)
+		if (old.y () < y + workArea.y () + border.top)
 		{
-		    xwc->y = y + workArea.y () + serverInput.top;
+		    xwc->y = y + workArea.y () + border.top;
 		    mask |= CWY;
 		}
 		else
@@ -3555,16 +3555,16 @@
 		    height = xwc->height + old.border () * 2;
 
 		    max = y + workArea.bottom ();
-		    if (old.y () + (int) old.height () + serverInput.bottom > max)
+		    if (old.y () + (int) old.height () + border.bottom > max)
 		    {
-			xwc->y = max - height - serverInput.bottom;
+			xwc->y = max - height - border.bottom;
 			mask |= CWY;
 		    }
-		    else if (old.y () + height + serverInput.bottom > max)
+		    else if (old.y () + height + border.bottom > max)
 		    {
 			xwc->y = y + workArea.y () +
-			         (workArea.height () - serverInput.top - height -
-				  serverInput.bottom) / 2 + serverInput.top;
+			         (workArea.height () - border.top - height -
+				  border.bottom) / 2 + border.top;
 			mask |= CWY;
 		    }
 		}
@@ -3572,9 +3572,9 @@
 
 	    if (state & CompWindowStateMaximizedHorzMask)
 	    {
-		if (old.x () < x + workArea.x () + serverInput.left)
+		if (old.x () < x + workArea.x () + border.left)
 		{
-		    xwc->x = x + workArea.x () + serverInput.left;
+		    xwc->x = x + workArea.x () + border.left;
 		    mask |= CWX;
 		}
 		else
@@ -3582,16 +3582,16 @@
 		    width = xwc->width + old.border () * 2;
 
 		    max = x + workArea.right ();
-		    if (old.x () + (int) old.width () + serverInput.right > max)
+		    if (old.x () + (int) old.width () + border.right > max)
 		    {
-			xwc->x = max - width - serverInput.right;
+			xwc->x = max - width - border.right;
 			mask |= CWX;
 		    }
-		    else if (old.x () + width + serverInput.right > max)
+		    else if (old.x () + width + border.right > max)
 		    {
 			xwc->x = x + workArea.x () +
-			         (workArea.width () - serverInput.left - width -
-				  serverInput.right) / 2 + serverInput.left;
+			         (workArea.width () - border.left - width -
+				  border.right) / 2 + border.left;
 			mask |= CWX;
 		    }
 		}

=== modified file 'unity/unity_window_decorator/src/events.c'
--- unity/unity_window_decorator/src/events.c	2011-09-22 04:30:04 +0000
+++ unity/unity_window_decorator/src/events.c	2011-09-30 02:01:23 +0000
@@ -136,26 +136,26 @@
 	{
 	    if (state == BUTTON_EVENT_ACTION_STATE)
 	    {
-		if (gtkwd_event->button == 2)
+		if (wnck_window_is_maximized (win))
+		    wnck_window_unmaximize (win);
+		if (wnck_window_is_maximized_vertically (win))
+		    wnck_window_unmaximize_vertically (win);
+		else if (wnck_window_is_maximized_horizontally (win))
+		    wnck_window_unmaximize_horizontally (win);
+		else
 		{
-		    if (wnck_window_is_maximized_vertically (win))
-			wnck_window_unmaximize_vertically (win);
-		    else
+		    if (gtkwd_event->button == 2)
+		    {
 			wnck_window_maximize_vertically (win);
-		}
-		else if (gtkwd_event->button == 3)
-		{
-		    if (wnck_window_is_maximized_horizontally (win))
-			wnck_window_unmaximize_horizontally (win);
-		    else
+		    }
+		    else if (gtkwd_event->button == 3)
+		    {
 			wnck_window_maximize_horizontally (win);
-		}
-		else
-		{
-		    if (wnck_window_is_maximized (win))
-			wnck_window_unmaximize (win);
+		    }
 		    else
+		    {
 			wnck_window_maximize (win);
+		    }
 		}
 	    }
 	}

=== modified file 'unity/unity_window_decorator/src/metacity.c'
--- unity/unity_window_decorator/src/metacity.c	2011-09-22 04:30:04 +0000
+++ unity/unity_window_decorator/src/metacity.c	2011-09-30 02:01:23 +0000
@@ -527,7 +527,7 @@
     if (d->active)
 	*flags |= (MetaFrameFlags ) META_FRAME_HAS_FOCUS;
 
-    if ((d->state & META_MAXIMIZED) == META_MAXIMIZED)
+    if ((d->state & META_MAXIMIZED))
 	*flags |= (MetaFrameFlags ) META_FRAME_MAXIMIZED;
 
     if (d->state & WNCK_WINDOW_STATE_STICKY)
@@ -1153,7 +1153,7 @@
     decor_context_t *context;
     decor_shadow_t  *shadow;
 
-    if ((d->state & META_MAXIMIZED) == META_MAXIMIZED)
+    if ((d->state & META_MAXIMIZED))
     {
 	if (!d->frame_window)
 	{
@@ -1217,7 +1217,7 @@
     }
     else
     {
-	if ((d->state & META_MAXIMIZED) == META_MAXIMIZED)
+	if ((d->state & META_MAXIMIZED))
 	    decor_get_default_layout (context, d->client_width,
 				      d->client_height - titlebar_height,
 				      &layout);