From: Dave Foster Date: Sat, 23 Aug 2008 04:36:03 +0000 (-0400) Subject: Mika says rearrange it! X-Git-Tag: mikabox-3.4.7.2~29^2 X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=5e796254e49b969957ed6d189fc5dd395c4dbce6;p=mikachu%2Fopenbox.git Mika says rearrange it! --- diff --git a/openbox/client.c b/openbox/client.c index 810245ad..8647d570 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -4254,8 +4254,8 @@ void client_find_edge_directional(ObClient *self, ObDirection dir, RECT_SET(expand, cur->frame->area.x - config_window_margin, cur->frame->area.y - config_window_margin, - cur->frame->area.width + config_window_margin * 2, - cur->frame->area.height + config_window_margin * 2); + cur->frame->area.width + 2 * config_window_margin, + cur->frame->area.height + 2 * config_window_margin); detect_edge(expand, dir, my_head, my_size, my_edge_start, my_edge_size, dest, near_edge); } diff --git a/openbox/resist.c b/openbox/resist.c index 0db49fa3..897f179c 100644 --- a/openbox/resist.c +++ b/openbox/resist.c @@ -136,8 +136,8 @@ void resist_move_windows(ObClient *c, gint resist, gint *x, gint *y) RECT_SET(expand, target->frame->area.x - config_window_margin, target->frame->area.y - config_window_margin, - target->frame->area.width + config_window_margin * 2, - target->frame->area.height + config_window_margin * 2); + target->frame->area.width + 2 * config_window_margin, + target->frame->area.height + 2 * config_window_margin); if (resist_move_window(c->frame->area, expand, resist, x, y)) @@ -339,8 +339,8 @@ void resist_size_windows(ObClient *c, gint resist, gint *w, gint *h, RECT_SET(expand, target->frame->area.x - config_window_margin, target->frame->area.y - config_window_margin, - target->frame->area.width + config_window_margin * 2, - target->frame->area.height + config_window_margin * 2); + target->frame->area.width + 2 * config_window_margin, + target->frame->area.height + 2 * config_window_margin); if (resist_size_window(c->frame->area, expand, resist, w, h, dir))