From 56417d7224e8eb70f5b7221703f0225253cf9040 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Thu, 14 Apr 2016 12:16:58 +0200 Subject: also respect w key in --geometry mode, update changelog and manual --- ChangeLog | 5 +++++ man/feh.pre | 3 +++ src/winwidget.c | 3 ++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index fdb4ad9..fb4909e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +git HEAD + + * Fix w (size_to_image) key not updating window size when --scale-down + or --geometry is active + Sat, 09 Apr 2016 20:42:23 +0200 Daniel Friesel * Release v2.15 diff --git a/man/feh.pre b/man/feh.pre index 258ff21..80282d0 100644 --- a/man/feh.pre +++ b/man/feh.pre @@ -1269,6 +1269,9 @@ Toggle fullscreen .It w Bq size_to_image . Change window size to fit current image size +.Pq plus/minus zoom, if set . +In scale-down and fixed-geometry mode, this also updates the window size +limits. . .It x Bq close . diff --git a/src/winwidget.c b/src/winwidget.c index d9b7413..3641eb9 100644 --- a/src/winwidget.c +++ b/src/winwidget.c @@ -857,7 +857,8 @@ void winwidget_resize(winwidget winwid, int w, int h, int force_resize) winwid->had_resize = 1; XFlush(disp); - if (force_resize && opt.scale_down && (winwid->type != WIN_TYPE_THUMBNAIL)) { + if (force_resize && (opt.geom_flags & (WidthValue | HeightValue)) + && (winwid->type != WIN_TYPE_THUMBNAIL)) { opt.geom_w = winwid->w; opt.geom_h = winwid->h; } -- cgit v1.2.3