summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2016-04-14 12:16:58 +0200
committerDaniel Friesel <derf@finalrewind.org>2016-04-14 12:16:58 +0200
commit56417d7224e8eb70f5b7221703f0225253cf9040 (patch)
tree6683d3b660b53e13315e4ba248bf8e41633de81b /src
parent894da5961e5bb07251d5f10ee649ccac77f85fae (diff)
also respect w key in --geometry mode, update changelog and manual
Diffstat (limited to 'src')
-rw-r--r--src/winwidget.c3
1 files changed, 2 insertions, 1 deletions
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;
}