From be7b3df6c008f74b2ebec9a61dda3db7da9a2a9d Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Sun, 12 Feb 2012 16:12:40 +0100 Subject: Revert "Merge --scale-down / window dimension change patch" This reverts commit b6a1cff6db874f4708d5ff5ea6a17248610b7d90. --- src/winwidget.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/winwidget.c') diff --git a/src/winwidget.c b/src/winwidget.c index 36720ac..ae34045 100644 --- a/src/winwidget.c +++ b/src/winwidget.c @@ -71,7 +71,6 @@ static winwidget winwidget_allocate(void) ret->im_y = 0; ret->zoom = 1.0; ret->old_zoom = 1.0; - ret->has_manual_zoom = 0; ret->click_offset_x = 0; ret->click_offset_y = 0; @@ -395,9 +394,6 @@ void winwidget_render_image(winwidget winwid, int resize, int force_alias) if (winwid->im_y > winwid->h) winwid->im_y = winwid->h; - if (!winwid->has_manual_zoom && winwid->zoom < 1.0) - winwid->zoom = 1.0; - D(("winwidget_render_image resize %d force_alias %d im %dx%d\n", resize, force_alias, winwid->im_w, winwid->im_h)); @@ -405,7 +401,7 @@ void winwidget_render_image(winwidget winwid, int resize, int force_alias) if (!winwid->full_screen && opt.scale_down && ((winwid->w < winwid->im_w) || (winwid->h < winwid->im_h)) && - (!winwid->has_manual_zoom)) { + (winwid->old_zoom == 1.0)) { D(("scaling down image %dx%d\n", winwid->w, winwid->h)); feh_calc_needed_zoom(&(winwid->zoom), winwid->im_w, winwid->im_h, winwid->w, winwid->h); @@ -954,7 +950,6 @@ void feh_debug_print_winwid(winwidget w) void winwidget_reset_image(winwidget winwid) { - winwid->has_manual_zoom = 0; winwid->zoom = 1.0; winwid->old_zoom = 1.0; winwid->im_x = 0; -- cgit v1.2.3