diff options
| author | Daniel Friesel <derf@finalrewind.org> | 2011-06-06 09:17:48 +0200 |
|---|---|---|
| committer | Daniel Friesel <derf@finalrewind.org> | 2011-06-06 09:17:48 +0200 |
| commit | 481a0ec264aab1509f83334e66d929154ceb1d74 (patch) | |
| tree | 525bb2da57f84bc793cc0f71f563c52a41906a91 /src | |
| parent | 3d0806ca24bd8ae3c5547f4a03ee06b95f56cfdd (diff) | |
| download | feh-481a0ec264aab1509f83334e66d929154ceb1d74.zip | |
Respect --zoom 100 in --fullscreen mode (closes #47)
Diffstat (limited to 'src')
| -rw-r--r-- | src/winwidget.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/winwidget.c b/src/winwidget.c index 157817f..57a8b1d 100644 --- a/src/winwidget.c +++ b/src/winwidget.c @@ -464,10 +464,12 @@ void winwidget_render_image(winwidget winwid, int resize, int force_alias) double old_zoom = winwid->zoom; winwid->zoom = 0.01 * opt.default_zoom; - if ((winwid->im_h * winwid->zoom) > max_h) - winwid->zoom = old_zoom; - if ((winwid->im_w * winwid->zoom) > max_w) - winwid->zoom = old_zoom; + if (winwid->zoom != 1.0) { + if ((winwid->im_h * winwid->zoom) > max_h) + winwid->zoom = old_zoom; + else if ((winwid->im_w * winwid->zoom) > max_w) + winwid->zoom = old_zoom; + } winwid->im_x = ((int) (max_w - (winwid->im_w * winwid->zoom))) >> 1; |