[metacity] frame: Make sure to offset by invisible borders when unmanaging windows

[Alberts Muktupāvels <muktupavels src gnome org>]

commit 9fe51fd0b1bd7a23e28cb0e8c6f6e9c681666182
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Mon Oct 17 17:18:50 2011 -0400

    frame: Make sure to offset by invisible borders when unmanaging windows
    
    When we reparent a window to the root when we're exiting, we need to offset
    the position by the invisible borders, otherwise windows will creep up and
    to the left.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=660848

 src/core/frame.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/src/core/frame.c b/src/core/frame.c
index e29a69b..6584d74 100644
--- a/src/core/frame.c
+++ b/src/core/frame.c
@@ -173,6 +173,7 @@ void
 meta_window_destroy_frame (MetaWindow *window)
 {
   MetaFrame *frame;
+  MetaFrameBorders borders;
 
   if (window->frame == NULL)
     return;
@@ -181,6 +182,8 @@ meta_window_destroy_frame (MetaWindow *window)
 
   frame = window->frame;
 
+  meta_frame_calc_borders (frame, &borders);
+
   meta_bell_notify_frame_destroy (frame);
 
   /* Unparent the client window; it may be destroyed,
@@ -204,8 +207,8 @@ meta_window_destroy_frame (MetaWindow *window)
                     * coordinates here means we'll need to ensure a configure
                     * notify event is sent; see bug 399552.
                     */
-                   window->frame->rect.x,
-                   window->frame->rect.y);
+                   window->frame->rect.x + borders.invisible.left,
+                   window->frame->rect.y + borders.invisible.top);
   meta_error_trap_pop (window->display, FALSE);
 
   meta_ui_destroy_frame_window (window->screen->ui, frame->xwindow);