diff options
| author | Dana Jansens <danakj@orodu.net> | 2007-07-20 20:50:29 -0400 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2007-07-20 20:50:29 -0400 |
| commit | 4fa86a7073489f436ef1a2bc4dbdccacca461195 (patch) | |
| tree | eea09d845477d1fc98c81aa1aae98e63de9c330d /openbox | |
| parent | 00bc0e61bc9d81d28f44d22fe4190feef6727ce1 (diff) | |
don't resist in orthoganal directions when key resizing windows with aspect ratios
Diffstat (limited to 'openbox')
| -rw-r--r-- | openbox/moveresize.c | 57 |
1 files changed, 32 insertions, 25 deletions
diff --git a/openbox/moveresize.c b/openbox/moveresize.c index 1ef30e26..dd0605c6 100644 --- a/openbox/moveresize.c +++ b/openbox/moveresize.c @@ -381,7 +381,9 @@ static void calc_resize(gboolean keyboard, gint keydist, gint *dw, gint *dh, nw = ow + *dw; nh = oh + *dh; - if (moveresize_client->max_ratio || moveresize_client->min_ratio) { + if (!keyboard && + (moveresize_client->max_ratio || moveresize_client->min_ratio)) + { switch (dir) { case OB_DIRECTION_NORTH: case OB_DIRECTION_SOUTH: @@ -407,12 +409,13 @@ static void calc_resize(gboolean keyboard, gint keydist, gint *dw, gint *dh, } break; } - } - /* see its actual size (apply aspect ratios) */ - client_try_configure(moveresize_client, &x, &y, &nw, &nh, &lw, &lh, TRUE); - trydw = nw - ow; - trydh = nh - oh; + /* see its actual size (apply aspect ratios) */ + client_try_configure(moveresize_client, &x, &y, &nw, &nh, &lw, &lh, + TRUE); + trydw = nw - ow; + trydh = nh - oh; + } /* resist_size_* needs the frame size */ nw += moveresize_client->frame->size.left + @@ -435,26 +438,30 @@ static void calc_resize(gboolean keyboard, gint keydist, gint *dw, gint *dh, *dh = nh - oh; /* take aspect ratios into account for resistance */ - if (*dh != trydh) { /* got resisted */ - /* resize the width based on the height */ - if (moveresize_client->min_ratio) { - if (nh * moveresize_client->min_ratio > nw) - nw = (gint)(nh * moveresize_client->min_ratio); - } - if (moveresize_client->max_ratio) { - if (nh * moveresize_client->max_ratio < nw) - nw = (gint)(nh * moveresize_client->max_ratio); - } - } - if (*dw != trydw) { /* got resisted */ - /* resize the height based on the width */ - if (moveresize_client->min_ratio) { - if (nh * moveresize_client->min_ratio > nw) - nh = (gint)(nw / moveresize_client->min_ratio); + if (!keyboard && + (moveresize_client->max_ratio || moveresize_client->min_ratio)) + { + if (*dh != trydh) { /* got resisted */ + /* resize the width based on the height */ + if (moveresize_client->min_ratio) { + if (nh * moveresize_client->min_ratio > nw) + nw = (gint)(nh * moveresize_client->min_ratio); + } + if (moveresize_client->max_ratio) { + if (nh * moveresize_client->max_ratio < nw) + nw = (gint)(nh * moveresize_client->max_ratio); + } } - if (moveresize_client->max_ratio) { - if (nh * moveresize_client->max_ratio < nw) - nh = (gint)(nw / moveresize_client->max_ratio); + if (*dw != trydw) { /* got resisted */ + /* resize the height based on the width */ + if (moveresize_client->min_ratio) { + if (nh * moveresize_client->min_ratio > nw) + nh = (gint)(nw / moveresize_client->min_ratio); + } + if (moveresize_client->max_ratio) { + if (nh * moveresize_client->max_ratio < nw) + nh = (gint)(nw / moveresize_client->max_ratio); + } } } |