Alexander/nsxiv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into thumbs

Browse Source 
Conflicts:
	main.c
This commit is contained in:
Bert 2011-02-19 22:55:40 +01:00
commit 26bb005458
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main.c
View File

@ -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))) {