fix growtoedge so it doesn't move terminal windows around

diff --git a/openbox/actions/growtoedge.c b/openbox/actions/growtoedge.c
index fffcc4e0e199722f72ea2208e30061cb0a34807e..501c64dee9ac74a1f669b3f7ce48b7e9023a3a06 100644 (file)
--- a/openbox/actions/growtoedge.c
+++ b/openbox/actions/growtoedge.c
@@ -63,7 +63,7 @@ static gboolean run_func(ObActionsData *data, gpointer options)
     Options *o = options;
 
     if (data->client) {
-        gint x, y, w, h;
+        gint x, y, w, h, realw, realh, lw, lh;
 
         /* don't allow vertical resize if shaded */
         if (o->dir != OB_DIRECTION_NORTH || o->dir != OB_DIRECTION_SOUTH ||
@@ -71,12 +71,21 @@ static gboolean run_func(ObActionsData *data, gpointer options)
         {
             client_find_resize_directional(data->client, o->dir, TRUE,
                                            &x, &y, &w, &h);
+            realw = w;
+            realh = h;
+            client_try_configure(data->client, &x, &y, &realw, &realh,
+                                 &lw, &lh, TRUE);
+            /* if it's going to be resized smaller than it intended, don't
+               move the window over */
+            if (x != data->client->area.x) x += w - realw;
+            if (y != data->client->area.y) y += h - realh;
+
             if (x != data->client->area.x || y != data->client->area.y ||
                 w != data->client->area.width ||
                 h != data->client->area.height)
             {
                 actions_client_move(data, TRUE);
-                client_move_resize(data->client, x, y, w, h);
+                client_move_resize(data->client, x, y, realw, realh);
                 actions_client_move(data, FALSE);
             }
         }