From b56989f8fbfa6ab32e1fa8f54c0d03ff924c7308 Mon Sep 17 00:00:00 2001 From: baskerville Date: Thu, 19 Jul 2012 12:28:44 +0200 Subject: New commands: fit to the window's height/width --- image.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'image.c') diff --git a/image.c b/image.c index cb71efa..cb71fe3 100644 --- a/image.c +++ b/image.c @@ -365,7 +365,18 @@ bool img_fit(img_t *img) { zw = (float) img->win->w / (float) img->w; zh = (float) img->win->h / (float) img->h; - z = MIN(zw, zh); + switch (img->scalemode) { + case SCALE_WIDTH: + z = zw; + break; + case SCALE_HEIGHT: + z = zh; + break; + default: + z = MIN(zw, zh); + break; + } + z = MAX(z, zoom_min); z = MIN(z, zmax); @@ -448,11 +459,11 @@ void img_render(img_t *img) { img->dirty = false; } -bool img_fit_win(img_t *img) { +bool img_fit_win(img_t *img, scalemode_t sm) { if (img == NULL || img->im == NULL) return false; - img->scalemode = SCALE_FIT; + img->scalemode = sm; return img_fit(img); } -- cgit v1.2.3-54-g00ecf