use the frame size not the client size when figuring out if stuff fits on the screen

diff --git a/openbox/client.c b/openbox/client.c
index c57c66e84571ec5e4ec90813ffb6e3a150722924..e8b5416c4baa5a430184044c2e34005e84113754 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -494,7 +494,8 @@ void client_move_onscreen(ObClient *self, gboolean rude)
     int x = self->area.x;
     int y = self->area.y;
     if (client_find_onscreen(self, &x, &y,
-                             self->area.width, self->area.height, rude)) {
+                             self->frame->area.width,
+                             self->frame->area.height, rude)) {
         client_configure(self, OB_CORNER_TOPLEFT, x, y,
                          self->area.width, self->area.height,
                          TRUE, TRUE);

diff --git a/openbox/event.c b/openbox/event.c
index a7ed67fdab9664cddc32e8973e0b19666f3b0396..7db6945dc7d11bd4cbe3efbb16981e01751ad6f1 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -780,7 +780,11 @@ static void event_handle_client(ObClient *client, XEvent *e)
             {
                 int newx = x;
                 int newy = y;
-                client_find_onscreen(client, &newx, &newy, w, h, TRUE);
+                int fw = w +
+                    client->frame->size.left + client->frame->size.right;
+                int fh = h +
+                    client->frame->size.top + client->frame->size.bottom;
+                client_find_onscreen(client, &newx, &newy, fw, fh, TRUE);
                 if (e->xconfigurerequest.value_mask & CWX)
                     x = newx;
                 if (e->xconfigurerequest.value_mask & CWY)
@@ -979,7 +983,11 @@ static void event_handle_client(ObClient *client, XEvent *e)
             {
                 int newx = x;
                 int newy = y;
-                client_find_onscreen(client, &newx, &newy, w, h, TRUE);
+                int fw = w +
+                    client->frame->size.left + client->frame->size.right;
+                int fh = h +
+                    client->frame->size.top + client->frame->size.bottom;
+                client_find_onscreen(client, &newx, &newy, fw, fh, TRUE);
                 if (e->xclient.data.l[0] & 1 << 8)
                     x = newx;
                 if (e->xclient.data.l[0] & 1 << 9)