[mutter] window: Fix meta_window_move_frame in the context of the new invisible borders

[Jasper St. Pierre <jstpierre src gnome org>]

commit c47039db8277a093a91b35d91c49a3244ed9d6e8
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Tue Sep 20 17:45:19 2011 -0400

    window: Fix meta_window_move_frame in the context of the new invisible borders
    
    https://bugzilla.gnome.org/show_bug.cgi?id=659643

 src/core/window.c |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/src/core/window.c b/src/core/window.c
index efd1b3c..bc56f2e 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -5062,11 +5062,16 @@ meta_window_move_frame (MetaWindow  *window,
 
   if (window->frame)
     {
-      /* offset by the distance between the origin of the window
-       * and the origin of the enclosing window decorations
+      MetaFrameBorders borders;
+      meta_frame_calc_borders (window->frame, &borders);
+
+      /* root_x_nw and root_y_nw correspond to where the top of
+       * the visible frame should be. Offset by the distance between
+       * the origin of the window and the origin of the enclosing
+       * window decorations.
        */
-      x += window->frame->child_x;
-      y += window->frame->child_y;
+      x += window->frame->child_x - borders.invisible.left;
+      y += window->frame->child_y - borders.invisible.top;
     }
   meta_window_move (window, user_op, x, y);
 }