summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDennis Real <github@tildepipe.org>2012-03-06 21:42:40 +0100
committerDennis Real <github@tildepipe.org>2012-03-06 21:42:40 +0100
commit93a90e60d0cf093ca71c34f4f5dbfde974f433f0 (patch)
tree6fc47bd6b773f602db5e4c59dc952c046f76d869 /src
parenta81465d019593cfd1e506eb66f20f6b5e10488f3 (diff)
parent52d5da9c0d6e4f10b5cba384297821008dbbed2b (diff)
Merge branch 'master' of git://github.com/derf/feh
Diffstat (limited to 'src')
-rw-r--r--src/keyevents.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/keyevents.c b/src/keyevents.c
index fd8a4d2..0ada751 100644
--- a/src/keyevents.c
+++ b/src/keyevents.c
@@ -607,11 +607,9 @@ void feh_event_handle_keypress(XEvent * ev)
winwid->old_zoom = 1.001;
winwidget_center_image(winwid);
winwidget_render_image(winwid, 0, 0);
- /*
- * --scale-down used to do weird stuff for zoom = 1.0, but setting
- * it to another value here is not the way to go. Also, couldn't
- * reproduce the issue -- 2012-02-16
- */
+ /* --scale-down will also do weird stuff if zoom is 1.0 */
+ if (opt.scale_down)
+ winwid->zoom = 1.001;
}
else if (feh_is_kp(&keys.zoom_fit, keysym, state)) {
feh_calc_needed_zoom(&winwid->zoom, winwid->im_w, winwid->im_h, winwid->w, winwid->h);