summaryrefslogtreecommitdiff
path: root/src/keyevents.c
diff options
context:
space:
mode:
authorDennis Real <github@tildepipe.org>2012-02-28 22:36:08 +0100
committerDennis Real <github@tildepipe.org>2012-02-28 22:36:08 +0100
commite0bedc0438cf4ab4eafe43afca0886ad63591560 (patch)
tree957ebc0131270c86860612299e1bd92274d0a4be /src/keyevents.c
parent46801fee8de26f4e0af2ed294c3a4f7fc1c45ca3 (diff)
parent69ecc5c1fdbff7c26d2d59cfdda86eeaf0ffadff (diff)
Merge remote branch 'upstream/master'
Diffstat (limited to 'src/keyevents.c')
-rw-r--r--src/keyevents.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/keyevents.c b/src/keyevents.c
index 0ada751..fd8a4d2 100644
--- a/src/keyevents.c
+++ b/src/keyevents.c
@@ -607,9 +607,11 @@ void feh_event_handle_keypress(XEvent * ev)
winwid->old_zoom = 1.001;
winwidget_center_image(winwid);
winwidget_render_image(winwid, 0, 0);
- /* --scale-down will also do weird stuff if zoom is 1.0 */
- if (opt.scale_down)
- winwid->zoom = 1.001;
+ /*
+ * --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
+ */
}
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);