[mutter/gnome-3-14] window-x11: Fix height computation of shaded windows

[Florian Müllner <fmuellner src gnome org>]

commit 63ad42e1f63dfcb3a2dbc8435c049c96a4934d1c
Author: Florian Müllner <fmuellner gnome org>
Date:   Fri Mar 13 13:52:05 2015 +0100

    window-x11: Fix height computation of shaded windows
    
    Since commit 6e06648f7, we start out with the invisible frame parts
    only, and then add the unconstrained rect's height (which consists of
    the visible parts of both frame and client window) *unless* the window
    is shaded. While we indeed don't want to add the client height in that
    case, we need to explicitly include the visible frame parts now.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=746145

 src/x11/window-x11.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c
index 0d6d142..1e2580c 100644
--- a/src/x11/window-x11.c
+++ b/src/x11/window-x11.c
@@ -1073,9 +1073,10 @@ meta_window_x11_move_resize_internal (MetaWindow                *window,
       /* Compute new frame size */
       new_w = window->rect.width + borders.invisible.left + borders.invisible.right;
 
-      new_h = borders.invisible.top + borders.invisible.bottom;
-      if (!window->shaded)
-        new_h += window->rect.height;
+      if (window->shaded)
+        new_h = borders.total.top + borders.total.bottom;
+      else
+        new_h = window->rect.height + borders.invisible.top + borders.invisible.bottom;
 
       if (new_w != window->frame->rect.width ||
           new_h != window->frame->rect.height)