diff options
author | Daniel Friesel <derf@finalrewind.org> | 2015-05-23 09:33:20 +0200 |
---|---|---|
committer | Daniel Friesel <derf@finalrewind.org> | 2015-05-23 09:33:53 +0200 |
commit | 82f6f0a4a7926d4d9fb8ba1fe99a9d71a2d7c798 (patch) | |
tree | e729ddad9d06cc0092176e26a8bedc7385feed73 | |
parent | 849103d86551d44fdb30152da51ca6927666001c (diff) |
winwidget: resize: only check scale_down when not in fullscreen mode (closes #192)
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | src/winwidget.c | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -1,3 +1,7 @@ +git HEAD + + * Fix --scale-down breaking image centering in fullscreen mode + Sun, 17 May 2015 20:40:36 +0200 Daniel Friesel <derf+feh@finalrewind.org> * Release v2.13 diff --git a/src/winwidget.c b/src/winwidget.c index a1b78d3..65cefca 100644 --- a/src/winwidget.c +++ b/src/winwidget.c @@ -443,8 +443,8 @@ void winwidget_render_image(winwidget winwid, int resize, int force_alias) feh_calc_needed_zoom(&(winwid->zoom), winwid->im_w, winwid->im_h, winwid->w, winwid->h); - if (resize && !opt.scale_down && (winwid->full_screen - || (opt.geom_flags & (WidthValue | HeightValue)))) { + if (resize && (winwid->full_screen + || (!opt.scale_down && (opt.geom_flags & (WidthValue | HeightValue))))) { int smaller; /* Is the image smaller than screen? */ int max_w = 0, max_h = 0; |