X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fresist.c;h=49875fbb7ca02153b7f2d9c8dfbb75af20e298d3;hb=7c1a00802326a608bc1baeb67731a9ab3eda8ba6;hp=e3d32d64a956e0bf3a2cddfac486f9e3bdd1bfba;hpb=042b6bc5f7b94de4718d7baac02d84c9aa1d875e;p=chaz%2Fopenbox

diff --git a/openbox/resist.c b/openbox/resist.c
index e3d32d64..49875fbb 100644
--- a/openbox/resist.c
+++ b/openbox/resist.c
@@ -36,7 +36,7 @@ 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);
+    frame_client_gravity(c->frame, x, y);
 
     w = c->frame->area.width;
     h = c->frame->area.height;
@@ -62,7 +62,7 @@ void resist_move_windows(ObClient *c, gint resist, gint *x, gint *y)
         /* don't snap to self or non-visibles */
         if (!target->frame->visible || target == c) continue; 
         /* don't snap to windows set to below and skip_taskbar (desklets) */
-        if (target->below && target->skip_taskbar) continue;
+        if (target->below && !c->below && target->skip_taskbar) continue;
 
         tl = RECT_LEFT(target->frame->area) - 1;
         tt = RECT_TOP(target->frame->area) - 1;
@@ -113,7 +113,7 @@ 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);
+    frame_frame_gravity(c->frame, x, y);
 }
 
 void resist_move_monitors(ObClient *c, gint resist, gint *x, gint *y)
@@ -129,7 +129,7 @@ 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);
+    frame_client_gravity(c->frame, x, y);
 
     w = c->frame->area.width;
     h = c->frame->area.height;
@@ -188,7 +188,7 @@ void resist_move_monitors(ObClient *c, gint resist, gint *x, gint *y)
         g_free(parea);
     }
 
-    frame_frame_gravity(c->frame, x, y, c->area.width, c->area.height);
+    frame_frame_gravity(c->frame, x, y);
 }
 
 void resist_size_windows(ObClient *c, gint resist, gint *w, gint *h,
@@ -220,7 +220,7 @@ void resist_size_windows(ObClient *c, gint resist, gint *w, gint *h,
         /* don't snap to invisibles or ourself */
         if (!target->frame->visible || target == c) continue; 
         /* don't snap to windows set to below and skip_taskbar (desklets) */
-        if (target->below && target->skip_taskbar) continue;
+        if (target->below && !c->below && target->skip_taskbar) continue;
 
         tl = RECT_LEFT(target->frame->area);
         tr = RECT_RIGHT(target->frame->area);