diff options
| author | ulteq <ulteq@web.de> | 2017-12-29 12:34:48 +0100 |
|---|---|---|
| committer | ulteq <ulteq@web.de> | 2018-03-10 21:30:54 +0100 |
| commit | 30c40b7e7fc573e1bda6264c507e4883791a1c05 (patch) | |
| tree | ca1777f7588bb022e1815328fc5cba72afffca4a /src | |
| parent | 6407071aa3d4a213565b0e47fc14c06848a7d582 (diff) | |
Fix window auto-resize with --keep-zoom-vp enabled
--keep-zoom-vp will no longer block the dynamic window resizing mechanism.
Diffstat (limited to 'src')
| -rw-r--r-- | src/slideshow.c | 10 | ||||
| -rw-r--r-- | src/winwidget.c | 3 |
2 files changed, 4 insertions, 9 deletions
diff --git a/src/slideshow.c b/src/slideshow.c index effdcaf..071cb29 100644 --- a/src/slideshow.c +++ b/src/slideshow.c @@ -223,10 +223,8 @@ void feh_reload_image(winwidget w, int resize, int force_new) w->im_x = tim_x; w->im_y = tim_y; w->zoom = tzoom; - winwidget_render_image(w, 0, 0); - } else { - winwidget_render_image(w, resize, 0); } + winwidget_render_image(w, resize, 0); return; } @@ -386,11 +384,7 @@ void slideshow_change_image(winwidget winwid, int change, int render) winwid->zoom = tzoom; } if (render) { - if (opt.keep_zoom_vp) { - winwidget_render_image(winwid, 0, 0); - } else { - winwidget_render_image(winwid, 1, 0); - } + winwidget_render_image(winwid, 1, 0); } break; } else diff --git a/src/winwidget.c b/src/winwidget.c index 917e74d..3c90b57 100644 --- a/src/winwidget.c +++ b/src/winwidget.c @@ -426,7 +426,8 @@ void winwidget_render_image(winwidget winwid, int resize, int force_alias) if (!winwid->full_screen && resize) { winwidget_resize(winwid, winwid->im_w, winwid->im_h, 0); - winwidget_reset_image(winwid); + if (!opt.keep_zoom_vp) + winwidget_reset_image(winwid); } D(("winwidget_render_image resize %d force_alias %d im %dx%d\n", |