Mika says rearrange it!

diff --git a/openbox/client.c b/openbox/client.c
index 810245ad91e5de1c8e2d9ea324a7e7e2cdde6985..8647d570f638b0265614d248a818ddb721af3e72 100644 (file)
--- 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 0db49fa36a36fb4ba906c9dc43dbfca3cccdeba8..897f179c00560dcf5e3433dc386e108b2c1fca1f 100644 (file)
--- 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))