make frame and client window in a consistant mapped state when the window is grabbed

diff --git a/openbox/frame.c b/openbox/frame.c
index 06b0117340bae7c3bce80030c5788935998d79ea..9a506d15560ebf56b8a28321348c4e7ba99f01bd 100644 (file)
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -531,10 +531,14 @@ void frame_grab_client(ObFrame *self, ObClient *client)
        req's) the ButtonPress is to catch clicks on the client border */
     XSelectInput(ob_display, self->plate, PLATE_EVENTMASK);
 
+    frame_adjust_area(self, TRUE, TRUE, FALSE);
+
     /* map the client so it maps when the frame does */
     XMapWindow(ob_display, client->window);
-
-    frame_adjust_area(self, TRUE, TRUE, FALSE);
+    /* map the frame so they are in a consistant state together */
+    XMapWindow(ob_display, self->window);
+    /* reflect that we're initially visible */
+    self->visible = TRUE;
 
     /* set all the windows for the frame in the window_map */
     g_hash_table_insert(window_map, &self->window, client);