summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--src/winwidget.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1ca6cf9..31686b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat, 16 Apr 2016 18:32:38 +0200
+
+* Release v2.15.2
+ * Fix --keep-zoom-vp not keeping the viewport x/y offsets (broken by 2.15)
+
Fri, 15 Apr 2016 10:18:37 +0200 Daniel Friesel <derf+feh@finalrewind.org>
* Release v2.15.1
diff --git a/src/winwidget.c b/src/winwidget.c
index 3641eb9..7b178b6 100644
--- a/src/winwidget.c
+++ b/src/winwidget.c
@@ -519,7 +519,7 @@ void winwidget_render_image(winwidget winwid, int resize, int force_alias)
}
}
else if (need_center && !winwid->full_screen
- && (winwid->type != WIN_TYPE_THUMBNAIL)) {
+ && (winwid->type != WIN_TYPE_THUMBNAIL) && !opt.keep_zoom_vp) {
winwid->im_x = (int) (winwid->w - (winwid->im_w * winwid->zoom)) >> 1;
winwid->im_y = (int) (winwid->h - (winwid->im_h * winwid->zoom)) >> 1;
}