the coordiantes are from the client, not the frame

diff --git a/openbox/resist.c b/openbox/resist.c
index 077c46677413f45db27e0f75917d5b479557a98c..729f83fc891ebf99db7172c2c5a5d5e8d32b1fac 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;
 
@@ -112,6 +114,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 +130,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 +179,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,

diff --git a/openbox/resist.h b/openbox/resist.h
index 7c3ed3c385e1b97d305b0361b7685704ab0f35d4..d61e7f2e75768451ed8f82c8c8aa7cfeed6143d5 100644 (file)
--- a/openbox/resist.h
+++ b/openbox/resist.h
@@ -23,7 +23,13 @@ struct _ObClient;
 
 #include <glib.h>
 
+/*! @x The client's x destination (in the client's coordinates, not the frame's
+    @y The client's y destination (in the client's coordinates, not the frame's
+*/
 void resist_move_windows(struct _ObClient *c, gint resist, gint *x, gint *y);
+/*! @x The client's x destination (in the client's coordinates, not the frame's
+    @y The client's y destination (in the client's coordinates, not the frame's
+*/
 void resist_move_monitors(struct _ObClient *c, gint resist, gint *x, gint *y);
 void resist_size_windows(struct _ObClient *c, gint resist, gint *w, gint *h,
                          ObCorner corn);