From b9b84ee55d6b255bcf39a4f8ca6195749ef1fc5c Mon Sep 17 00:00:00 2001 From: ulteq Date: Sun, 14 Jan 2018 17:20:14 +0100 Subject: Handle --min-dimension and --max-dimension without preload This will (by default) check the image dimension on-the-fly, but you can still do it beforehand by specifying the preload flag. --- src/slideshow.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'src/slideshow.c') diff --git a/src/slideshow.c b/src/slideshow.c index db389d5..3d73d8e 100644 --- a/src/slideshow.c +++ b/src/slideshow.c @@ -378,16 +378,22 @@ void slideshow_change_image(winwidget winwid, int change, int render) tzoom = winwid->zoom; } - if ((winwidget_loadimage(winwid, FEH_FILE(current_file->data))) - != 0) { + if (winwidget_loadimage(winwid, FEH_FILE(current_file->data))) { + unsigned int w = gib_imlib_image_get_width(winwid->im); + unsigned int h = gib_imlib_image_get_height(winwid->im); + if (opt.min_width || opt.min_height || (opt.max_width != UINT_MAX) || (opt.max_height != UINT_MAX)) { + if (w < opt.min_width || w > opt.max_width || h < opt.min_height || h > opt.max_height) { + last = current_file; + continue; + } + } winwid->mode = MODE_NORMAL; winwid->file = current_file; - if ((winwid->im_w != gib_imlib_image_get_width(winwid->im)) - || (winwid->im_h != gib_imlib_image_get_height(winwid->im))) + if ((winwid->im_w != (int)w) || (winwid->im_h != (int)h)) winwid->had_resize = 1; winwidget_reset_image(winwid); - winwid->im_w = gib_imlib_image_get_width(winwid->im); - winwid->im_h = gib_imlib_image_get_height(winwid->im); + winwid->im_w = w; + winwid->im_h = h; if (opt.keep_zoom_vp) { /* put back in: */ winwid->mode = tmode; -- cgit v1.2.3