diff options
author | baskerville <nihilhill@gmail.com> | 2012-07-19 12:28:44 +0200 |
---|---|---|
committer | baskerville <nihilhill@gmail.com> | 2012-07-19 12:28:44 +0200 |
commit | b56989f8fbfa6ab32e1fa8f54c0d03ff924c7308 (patch) | |
tree | 75b1a7c94f52f03184e373bf634f395d3f88ff06 /image.c | |
parent | 5b6467913cca4086ebb6056e7235a3c78570ce6f (diff) |
New commands: fit to the window's height/width
Diffstat (limited to 'image.c')
-rw-r--r-- | image.c | 17 |
1 files changed, 14 insertions, 3 deletions
@@ -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); } |