diff options
author | Dennis Real <github@tildepipe.org> | 2012-11-11 21:26:42 +0100 |
---|---|---|
committer | Dennis Real <github@tildepipe.org> | 2012-11-11 21:26:42 +0100 |
commit | a3d28a957f8b4a24cbc102a8dca77bb78b568ab4 (patch) | |
tree | 4025736270638f5035e28541b7edee40ef6700bb /src/winwidget.c | |
parent | 0f6d9518b5a12538e4064ef1c397b62e6be61f3b (diff) | |
parent | 96d57781be7171d29c7ea0ecbbddc48ad374885c (diff) |
Merge branch 'master' of git://github.com/derf/feh
Diffstat (limited to 'src/winwidget.c')
-rw-r--r-- | src/winwidget.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/winwidget.c b/src/winwidget.c index 0a9adc8..2f543df 100644 --- a/src/winwidget.c +++ b/src/winwidget.c @@ -402,6 +402,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->type != WIN_TYPE_THUMBNAIL) && (winwid->old_zoom == 1.0)) { D(("scaling down image %dx%d\n", winwid->w, winwid->h)); @@ -512,7 +513,8 @@ void winwidget_render_image(winwidget winwid, int resize, int force_alias) winwid->im_y = (int) (max_h - (winwid->im_h * winwid->zoom)) >> 1; } } - else if (need_center && !winwid->full_screen && opt.scale_down) { + else if (need_center && !winwid->full_screen && opt.scale_down + && (winwid->type != WIN_TYPE_THUMBNAIL)) { winwid->im_x = (int) (winwid->w - (winwid->im_w * winwid->zoom)) >> 1; winwid->im_y = (int) (winwid->h - (winwid->im_h * winwid->zoom)) >> 1; } |