Merge commit 'nightm4re/3.4-working-padding' into wip/mikabox

diff --cc openbox/client.c
index 0d521f7320de1b1a0ceb2aa5c5212564a81e60a7,c1ca1f78b1e1148c0d7404fb082d417b0dd5f46f..658203132cd4e7049daf8129a962879f23cf5280
--- 1/openbox/client.c
--- 2/openbox/client.c
+++ b/openbox/client.c
@@@ -4189,13 -4250,21 +4189,21 @@@ void client_find_edge_directional(ObCli
              cur->desktop != screen_desktop)
              continue;
  
 -        ob_debug("trying window %s\n", cur->title);
 +        ob_debug("trying window %s", cur->title);
  
-         RECT_SET(expand, cur->frame->area.x - config_window_margin, 
-                          cur->frame->area.y - config_window_margin, 
-                          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,
+         /* detect window+margin if we have a margin set */        
+         if (config_window_margin != 0)
+         {
+             RECT_SET(expand, cur->frame->area.x - config_window_margin, 
+                              cur->frame->area.y - config_window_margin, 
+                              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);
+         }
+ 
+         /* now detect window by itself */
+         detect_edge(cur->frame->area, dir, my_head, my_size, my_edge_start,
                      my_edge_size, dest, near_edge);
      }
      dock_get_area(&dock_area);