summaryrefslogtreecommitdiff
path: root/src/events.c
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2012-02-12 14:02:36 +0100
committerDaniel Friesel <derf@finalrewind.org>2012-02-12 14:02:36 +0100
commitb6a1cff6db874f4708d5ff5ea6a17248610b7d90 (patch)
treedfb7c6b426e026970da9c04321e8e630b1bc5b6f /src/events.c
parentb1e497e7555d2c72fb8b64a00c3e6804f36bd62f (diff)
Merge --scale-down / window dimension change patch
Diffstat (limited to 'src/events.c')
-rw-r--r--src/events.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/events.c b/src/events.c
index 0d5e07d..9fb2379 100644
--- a/src/events.c
+++ b/src/events.c
@@ -235,6 +235,7 @@ static void feh_event_handle_ButtonPress(XEvent * ev)
winwid->click_offset_x = ev->xbutton.x;
winwid->click_offset_y = ev->xbutton.y;
winwid->old_zoom = winwid->zoom;
+ winwid->has_manual_zoom = 1;
/* required to adjust the image position in zoom mode */
winwid->im_click_offset_x = (winwid->click_offset_x
@@ -332,6 +333,7 @@ static void feh_event_handle_ButtonRelease(XEvent * ev)
&& (ev->xbutton.x == winwid->click_offset_x)
&& (ev->xbutton.y == winwid->click_offset_y)) {
winwid->zoom = 1.0;
+ winwid->has_manual_zoom = 0;
winwidget_center_image(winwid);
} else
winwidget_sanitise_offsets(winwid);