mirror of
				https://github.com/leahneukirchen/cwm.git
				synced 2023-08-10 21:13:12 +03:00 
			
		
		
		
	Make sure we really take work area gap into account with snap calculations;
from Dominik Honnef via Christian Neukirchen.
This commit is contained in:
		
							
								
								
									
										4
									
								
								kbfunc.c
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								kbfunc.c
									
									
									
									
									
								
							@@ -101,10 +101,10 @@ kbfunc_client_moveresize(struct client_ctx *cc, union arg *arg)
 | 
			
		||||
 | 
			
		||||
		cc->geom.x += client_snapcalc(cc->geom.x,
 | 
			
		||||
		    cc->geom.x + cc->geom.w + (cc->bwidth * 2),
 | 
			
		||||
		    sc->work.x, sc->work.w, sc->snapdist);
 | 
			
		||||
		    sc->work.x, sc->work.x + sc->work.w, sc->snapdist);
 | 
			
		||||
		cc->geom.y += client_snapcalc(cc->geom.y,
 | 
			
		||||
		    cc->geom.y + cc->geom.h + (cc->bwidth * 2),
 | 
			
		||||
		    sc->work.y, sc->work.h, sc->snapdist);
 | 
			
		||||
		    sc->work.y, sc->work.y + sc->work.h, sc->snapdist);
 | 
			
		||||
 | 
			
		||||
		client_move(cc);
 | 
			
		||||
		xu_ptr_getpos(cc->win, &x, &y);
 | 
			
		||||
 
 | 
			
		||||
@@ -147,10 +147,10 @@ mousefunc_client_move(struct client_ctx *cc, void *arg)
 | 
			
		||||
 | 
			
		||||
			cc->geom.x += client_snapcalc(cc->geom.x,
 | 
			
		||||
			    cc->geom.x + cc->geom.w + (cc->bwidth * 2),
 | 
			
		||||
			    sc->work.x, sc->work.w, sc->snapdist);
 | 
			
		||||
			    sc->work.x, sc->work.x + sc->work.w, sc->snapdist);
 | 
			
		||||
			cc->geom.y += client_snapcalc(cc->geom.y,
 | 
			
		||||
			    cc->geom.y + cc->geom.h + (cc->bwidth * 2),
 | 
			
		||||
			    sc->work.y, sc->work.h, sc->snapdist);
 | 
			
		||||
			    sc->work.y, sc->work.y + sc->work.h, sc->snapdist);
 | 
			
		||||
 | 
			
		||||
			/* don't move more than 60 times / second */
 | 
			
		||||
			if ((ev.xmotion.time - ltime) > (1000 / 60)) {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user