summaryrefslogtreecommitdiffstats
Unidiff
-rw-r--r--Makefile.am17
-rw-r--r--src/controller/actions/pan.c23
-rw-r--r--src/controller/actions/set_ortho.c5
-rw-r--r--src/controller/actions/zoom.c8
-rw-r--r--src/controller/callbacks/keyboard.c2
-rw-r--r--src/controller/callbacks/mouse.c30
-rw-r--r--src/controller/callbacks/mouse_motion.c2
-rw-r--r--src/controller/callbacks/mouse_wheel.c8
-rw-r--r--src/controller/callbacks/reshape.c26
-rw-r--r--src/model/geometry/map_geometry.c10
-rw-r--r--src/model/state/pan_info_init.h2
-rw-r--r--src/model/state/zoom_info_init.c2
12 files changed, 70 insertions, 65 deletions
diff --git a/src/controller/callbacks/mouse_wheel.c b/src/controller/callbacks/mouse_wheel.c
index 9ca73bc..05ce734 100644
--- a/src/controller/callbacks/mouse_wheel.c
+++ b/src/controller/callbacks/mouse_wheel.c
@@ -6,7 +6,7 @@
66
7#define S state07#define S state0
88
9void 9void
10mouse_wheel (int button, int dir, int x, int y)10mouse_wheel (int button, int dir, int x, int y)
11{11{
12 /*12 /*
@@ -14,8 +14,8 @@ mouse_wheel (int button, int dir, int x, int y)
14 * start at the position of the mouse. Calculate a bounding box14 * start at the position of the mouse. Calculate a bounding box
15 * that will be the selection and zoom to it.15 * that will be the selection and zoom to it.
16 */16 */
17 double width = fabs(S.ortho.max_x - S.ortho.min_x);17 double width = fabs (S.ortho.max_x - S.ortho.min_x);
18 double height = fabs(S.ortho.max_y - S.ortho.min_y);18 double height = fabs (S.ortho.max_y - S.ortho.min_y);
1919
20 /*20 /*
21 * Box the smaller of the two dimensions.21 * Box the smaller of the two dimensions.
@@ -60,7 +60,7 @@ mouse_wheel (int button, int dir, int x, int y)
60 }60 }
6161
62 // Zoom in62 // Zoom in
63 if (dir > 0) 63 if (dir > 0)
64 {64 {
65 zoom (x1 + step, y1 + step, x2 - step, y2 - step);65 zoom (x1 + step, y1 + step, x2 - step, y2 - step);
66 }66 }

Valid XHTML 1.0 Strict

Copyright © 2009 Don Pellegrino All Rights Reserved.