From 98f82337ac9da3faccf63d131818e7a77953ec2c Mon Sep 17 00:00:00 2001 From: ulteq Date: Tue, 17 Jul 2018 12:02:56 +0200 Subject: Improve screen clip feature --- src/winwidget.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/winwidget.c b/src/winwidget.c index e54b49e..fe0b505 100644 --- a/src/winwidget.c +++ b/src/winwidget.c @@ -799,12 +799,16 @@ void winwidget_resize(winwidget winwid, int w, int h, int force_resize) } if (winwid && ((winwid->w != w) || (winwid->h != h))) { if (opt.screen_clip) { - double required_zoom = 1.0; - int max_w = (w > scr_width) ? scr_width : w; - int max_h = (h > scr_height) ? scr_height : h; - feh_calc_needed_zoom(&required_zoom, winwid->im_w, winwid->im_h, max_w, max_h); - winwid->w = winwid->im_w * required_zoom; - winwid->h = winwid->im_h * required_zoom; + double required_zoom = winwid->zoom; + if (opt.scale_down && !opt.keep_zoom_vp) { + int max_w = (w > scr_width) ? scr_width : w; + int max_h = (h > scr_height) ? scr_height : h; + feh_calc_needed_zoom(&required_zoom, winwid->im_w, winwid->im_h, max_w, max_h); + } + int desired_w = winwid->im_w * required_zoom; + int desired_h = winwid->im_h * required_zoom; + winwid->w = (desired_w > scr_width) ? scr_width : desired_w; + winwid->h = (desired_h > scr_height) ? scr_height : desired_h; } if (winwid->full_screen) { XTranslateCoordinates(disp, winwid->win, attributes.root, -- cgit v1.2.3