revert 7246 and simplify action_raiselower a bit, turns out 7246 wasn't needed for...

[chaz/openbox] / openbox / frame.c

diff --git a/openbox/frame.c b/openbox/frame.c
index 473bdd07e091b21a1514e13ef98111ab79ddfc39..fef8b833dae752aa73b8081bf28187f94e8ef57e 100644 (file)
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -741,10 +741,6 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
                    self->size.top + self->size.bottom));
 
     if ((moved || resized) && !fake) {
-        /* when the client has StaticGravity, it likes to move around. */
-        XMoveWindow(ob_display, self->client->window,
-                    self->size.left, self->size.top);
-
         /* find the new coordinates, done after setting the frame.size, for
            frame_client_gravity. */
         self->area.x = self->client->area.x;
@@ -768,6 +764,13 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
                               self->area.width,
                               self->area.height);
 
+        /* when the client has StaticGravity, it likes to move around.
+           also this correctly positions the client when it maps.
+           this also needs to be run when the frame's decorations sizes change!
+        */
+        XMoveWindow(ob_display, self->client->window,
+                    self->size.left, self->size.top);
+
         if (resized) {
             framerender_frame(self);
             frame_adjust_shape(self);