Merge branch 'master' into thumbs
Conflicts: main.c
This commit is contained in:
		
						commit
						26bb005458
					
				
							
								
								
									
										4
									
								
								main.c
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								main.c
									
									
									
									
									
								
							| @ -368,8 +368,8 @@ void on_keypress(XKeyEvent *kev) { | |||||||
| 
 | 
 | ||||||
| 			/* control window */ | 			/* control window */ | ||||||
| 			case XK_W: | 			case XK_W: | ||||||
| 				x = win.x + img.x; | 				x = MAX(0, win.x + img.x); | ||||||
| 				y = win.y + img.y; | 				y = MAX(0, win.y + img.y); | ||||||
| 				w = img.w * img.zoom; | 				w = img.w * img.zoom; | ||||||
| 				h = img.h * img.zoom; | 				h = img.h * img.zoom; | ||||||
| 				if ((changed = win_moveresize(&win, x, y, w, h))) { | 				if ((changed = win_moveresize(&win, x, y, w, h))) { | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Bert
						Bert