remove the edges_hit_layers_below option. don't use windows in other layers for resis...

[chaz/openbox] / openbox / resist.c

diff --git a/openbox/resist.c b/openbox/resist.c
index 077c46677413f45db27e0f75917d5b479557a98c..56bd214dbe8e51281812f63d1852b7da5f9e729b 100644 (file)
--- a/openbox/resist.c
+++ b/openbox/resist.c
@@ -36,6 +36,8 @@ void resist_move_windows(ObClient *c, gint resist, gint *x, gint *y)
 
     if (!resist) return;
 
+    frame_client_gravity(c->frame, x, y, c->area.width, c->area.height);
+
     w = c->frame->area.width;
     h = c->frame->area.height;
 
@@ -55,15 +57,14 @@ void resist_move_windows(ObClient *c, gint resist, gint *x, gint *y)
 
         if (!WINDOW_IS_CLIENT(it->data))
             continue;
+        /* only snap in the same layer */
+        if (window_layer(it->data) != c->layer)
+            continue;
         target = it->data;
 
         /* don't snap to self or non-visibles */
         if (!target->frame->visible || target == c) continue; 
 
-        /* don't snap to windows in layers beneath */
-        if(target->layer < c->layer && !config_resist_layers_below)
-            continue;
-
         tl = RECT_LEFT(target->frame->area) - 1;
         tt = RECT_TOP(target->frame->area) - 1;
         tr = RECT_RIGHT(target->frame->area) + 1;
@@ -112,6 +113,8 @@ void resist_move_windows(ObClient *c, gint resist, gint *x, gint *y)
 
         if (snapx && snapy) break;
     }
+
+    frame_frame_gravity(c->frame, x, y, c->area.width, c->area.height);
 }
 
 void resist_move_monitors(ObClient *c, gint resist, gint *x, gint *y)
@@ -126,6 +129,8 @@ void resist_move_monitors(ObClient *c, gint resist, gint *x, gint *y)
 
     if (!resist) return;
 
+    frame_client_gravity(c->frame, x, y, c->area.width, c->area.height);
+
     w = c->frame->area.width;
     h = c->frame->area.height;
 
@@ -173,6 +178,8 @@ void resist_move_monitors(ObClient *c, gint resist, gint *x, gint *y)
         else if (cb <= pb && b > pb && b < pb + resist)
             *y = pb - h + 1;
     }
+
+    frame_frame_gravity(c->frame, x, y, c->area.width, c->area.height);
 }
 
 void resist_size_windows(ObClient *c, gint resist, gint *w, gint *h,
@@ -199,15 +206,14 @@ void resist_size_windows(ObClient *c, gint resist, gint *w, gint *h,
     for (it = stacking_list; it; it = g_list_next(it)) {
         if (!WINDOW_IS_CLIENT(it->data))
             continue;
+        /* only snap in the same layer */
+        if (window_layer(it->data) != c->layer)
+            continue;
         target = it->data;
 
         /* don't snap to invisibles or ourself */
         if (!target->frame->visible || target == c) continue; 
 
-        /* don't snap to windows in layers beneath */
-        if(target->layer < c->layer && !config_resist_layers_below)
-            continue;
-
         tl = RECT_LEFT(target->frame->area);
         tr = RECT_RIGHT(target->frame->area);
         tt = RECT_TOP(target->frame->area);