Commit 30c40b7e authored by ulteq's avatar ulteq
Browse files

Fix window auto-resize with --keep-zoom-vp enabled 

--keep-zoom-vp will no longer block the dynamic window resizing mechanism.
parent 6407071a

src/slideshow.c

+2 −8
Original line number Diff line number Diff line
@@ -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,12 +384,8 @@ 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);

			}

			}

			break;

		} else

			last = current_file;

src/winwidget.c

+2 −1
Original line number Diff line number Diff line
@@ -426,6 +426,7 @@ 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);

		if (!opt.keep_zoom_vp)

			winwidget_reset_image(winwid);

	}