Commit 56417d72 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

also respect w key in --geometry mode, update changelog and manual

parent 894da596

ChangeLog

+5 −0
Original line number Diff line number Diff line 
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 <derf+feh@finalrewind.org>



* Release v2.15

man/feh.pre

+3 −0
Original line number Diff line number Diff line
@@ -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

.

src/winwidget.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

		}