From 422cbeb8cceac07a96ddff808da7ccb3110be725 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Tue, 6 Mar 2012 12:28:59 +0100 Subject: Revert "fix zoom_default for --scale-down" This reverts commit b257e011c4390900f14491e2cffe38b2d00892ec. Conflicts: ChangeLog --- ChangeLog | 2 -- src/keyevents.c | 8 +++----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 50bf99b..41d7dcd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,8 +5,6 @@ git HEAD * format specifier %P now prints the number of pixels with k/M suffix, like %S. Printing the program name ("feh") is no longer supported * feh --list now uses %S/%P to print image size and amount of pixels - * Fix zoom_default key (caused blurry images in some cases due to a bad - workaround) * make --quiet and --verbose behave more like their documented way, never ignore out of memory errors * Use ImageMagick (convert) as loader for unsupported file formats 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); -- cgit v1.2.3