summaryrefslogtreecommitdiff
path: root/src/events.c
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2011-09-28 17:30:10 +0200
committerDaniel Friesel <derf@finalrewind.org>2011-09-28 17:30:10 +0200
commit2963a156abf75542a3171dad45ddc9bcce2eb37f (patch)
tree14f8e3f5c7ddb610b83a409b700cdd3da721ce03 /src/events.c
parent4807123ba77c4018a1fcfa31cee04001c07ba4c5 (diff)
Set max/min zoom for both key and mouse zooming
Diffstat (limited to 'src/events.c')
-rw-r--r--src/events.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/events.c b/src/events.c
index def4651..2b8abdd 100644
--- a/src/events.c
+++ b/src/events.c
@@ -336,15 +336,15 @@ static void feh_event_handle_MotionNotify(XEvent * ev)
winwid->zoom = winwid->old_zoom + (
((double) ev->xmotion.x - (double) winwid->click_offset_x)
/ 128.0);
- /*/ ((double) (winwid->click_offset_x + 1)));*/
else
winwid->zoom = winwid->old_zoom - (
((double) winwid->click_offset_x - (double) ev->xmotion.x)
/ 128.0);
- /*/ ((double) (winwid->click_offset_x + 1)));*/
- if (winwid->zoom < 0.01)
- winwid->zoom = 0.01;
+ if (winwid->zoom < ZOOM_MIN)
+ winwid->zoom = ZOOM_MIN;
+ else if (winwid->zoom > ZOOM_MAX)
+ winwid->zoom = ZOOM_MAX;
/* center around click_offset */
winwid->im_x = winwid->click_offset_x