From e16222868dbe7a09c79418162b7fefbd194b6b8d Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Mon, 31 Oct 2011 10:08:33 +0100 Subject: Experimental --auto-zoom tiling support (use -.Z for best results) --- ChangeLog | 2 +- src/winwidget.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9bfbf0c..ace33d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ git HEAD - * Experimental --scale-down tiling support (see #54) + * Experimental --scale-down and --auto-zoom tiling support (see #54) * Fix http image load for long image names (closes debian #646421) Mon, 10 Oct 2011 12:25:00 +0200 Daniel Friesel diff --git a/src/winwidget.c b/src/winwidget.c index c678d5b..ed7002a 100644 --- a/src/winwidget.c +++ b/src/winwidget.c @@ -416,6 +416,12 @@ void winwidget_render_image(winwidget winwid, int resize, int force_alias) || (winwid->has_rotated))) feh_draw_checks(winwid); + if (!winwid->full_screen && opt.zoom_mode + && (winwid->zoom == 1.0) && !opt.geom_flags + && (winwid->w > winwid->im_w) && (winwid->h > winwid->im_h)) + feh_calc_needed_zoom(&(winwid->zoom), winwid->im_w, winwid->im_h, winwid->w, winwid->h); + + if (resize && (winwid->full_screen || opt.geom_flags)) { int smaller; /* Is the image smaller than screen? */ int max_w = 0, max_h = 0; -- cgit v1.2.3