-rw-r--r-- | src/controller/actions/set_ortho.c | 13 | ||||
-rw-r--r-- | src/controller/actions/zoom.c | 70 | ||||
-rw-r--r-- | src/controller/actions/zoom.h | 4 | ||||
-rw-r--r-- | src/controller/callbacks/display.c | 6 | ||||
-rw-r--r-- | src/controller/callbacks/keyboard.c | 7 | ||||
-rw-r--r-- | src/controller/callbacks/mouse.c | 49 | ||||
-rw-r--r-- | src/controller/callbacks/mouse_wheel.c | 66 | ||||
-rw-r--r-- | src/controller/callbacks/reshape.c | 68 | ||||
-rw-r--r-- | src/model/geometry/density_legend_geometry.c | 18 | ||||
-rw-r--r-- | src/model/state/zoom_info.h | 1 | ||||
-rw-r--r-- | src/model/state/zoom_info_init.c | 6 |
11 files changed, 197 insertions, 111 deletions
diff --git a/src/model/geometry/density_legend_geometry.c b/src/model/geometry/density_legend_geometry.c index e5baa08..ac3280c 100644 --- a/src/model/geometry/density_legend_geometry.c +++ b/src/model/geometry/density_legend_geometry.c | |||
@@ -27,20 +27,10 @@ density_legend_geometry (void) | |||
27 | const double *top; | 27 | const double *top; |
28 | const double *bottom; | 28 | const double *bottom; |
29 | 29 | ||
30 | if (S.zoom.active) | 30 | left = &S.ortho.min_x; |
31 | { | 31 | right = &S.ortho.max_x; |
32 | left = &S.zoom.coords[0]; | 32 | bottom = &S.ortho.min_y; |
33 | right = &S.zoom.coords[1]; | 33 | top = &S.ortho.max_y; |
34 | bottom = &S.zoom.coords[2]; | ||
35 | top = &S.zoom.coords[3]; | ||
36 | } | ||
37 | else | ||
38 | { | ||
39 | left = &S.ortho.min_x; | ||
40 | right = &S.ortho.max_x; | ||
41 | bottom = &S.ortho.min_y; | ||
42 | top = &S.ortho.max_y; | ||
43 | } | ||
44 | 34 | ||
45 | /* | 35 | /* |
46 | * This value should be a percentage of the world height so that it | 36 | * This value should be a percentage of the world height so that it |