-rw-r--r-- | Makefile.am | 17 | ||||
-rw-r--r-- | src/controller/actions/pan.c | 23 | ||||
-rw-r--r-- | src/controller/actions/set_ortho.c | 5 | ||||
-rw-r--r-- | src/controller/actions/zoom.c | 8 | ||||
-rw-r--r-- | src/controller/callbacks/keyboard.c | 2 | ||||
-rw-r--r-- | src/controller/callbacks/mouse.c | 30 | ||||
-rw-r--r-- | src/controller/callbacks/mouse_motion.c | 2 | ||||
-rw-r--r-- | src/controller/callbacks/mouse_wheel.c | 8 | ||||
-rw-r--r-- | src/controller/callbacks/reshape.c | 26 | ||||
-rw-r--r-- | src/model/geometry/map_geometry.c | 10 | ||||
-rw-r--r-- | src/model/state/pan_info_init.h | 2 | ||||
-rw-r--r-- | src/model/state/zoom_info_init.c | 2 |
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 @@ #define S state0 -void +void mouse_wheel (int button, int dir, int x, int y) { /* @@ -14,8 +14,8 @@ mouse_wheel (int button, int dir, int x, int y) * start at the position of the mouse. Calculate a bounding box * that will be the selection and zoom to it. */ - double width = fabs(S.ortho.max_x - S.ortho.min_x); - double height = fabs(S.ortho.max_y - S.ortho.min_y); + double width = fabs (S.ortho.max_x - S.ortho.min_x); + double height = fabs (S.ortho.max_y - S.ortho.min_y); /* * Box the smaller of the two dimensions. @@ -60,7 +60,7 @@ mouse_wheel (int button, int dir, int x, int y) } // Zoom in - if (dir > 0) + if (dir > 0) { zoom (x1 + step, y1 + step, x2 - step, y2 - step); } |