| -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) const double *top; const double *bottom; - if (S.zoom.active) - { - left = &S.zoom.coords[0]; - right = &S.zoom.coords[1]; - bottom = &S.zoom.coords[2]; - top = &S.zoom.coords[3]; - } - else - { - left = &S.ortho.min_x; - right = &S.ortho.max_x; - bottom = &S.ortho.min_y; - top = &S.ortho.max_y; - } + left = &S.ortho.min_x; + right = &S.ortho.max_x; + bottom = &S.ortho.min_y; + top = &S.ortho.max_y; /* * This value should be a percentage of the world height so that it |
