Browse Source

Merge branch 'master' into thumbs

Conflicts:
	main.c
master
Bert 14 years ago
parent
commit
26bb005458
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      main.c

+ 2
- 2
main.c View File

@@ -368,8 +368,8 @@ void on_keypress(XKeyEvent *kev) {

/* control window */
case XK_W:
x = win.x + img.x;
y = win.y + img.y;
x = MAX(0, win.x + img.x);
y = MAX(0, win.y + img.y);
w = img.w * img.zoom;
h = img.h * img.zoom;
if ((changed = win_moveresize(&win, x, y, w, h))) {


Loading…
Cancel
Save