(svn r7093) -Codechange: Move DoZoomInOutWindow declaration to viewport.h and rewrite the function
a bit more sensibly.
This commit is contained in:
38
main_gui.c
38
main_gui.c
@@ -866,29 +866,31 @@ bool DoZoomInOutWindow(int how, Window *w)
|
||||
assert(w);
|
||||
vp = w->viewport;
|
||||
|
||||
if (how == ZOOM_IN) {
|
||||
if (vp->zoom == 0) return false;
|
||||
vp->zoom--;
|
||||
vp->virtual_width >>= 1;
|
||||
vp->virtual_height >>= 1;
|
||||
switch (how) {
|
||||
case ZOOM_IN:
|
||||
if (vp->zoom == 0) return false;
|
||||
vp->zoom--;
|
||||
vp->virtual_width >>= 1;
|
||||
vp->virtual_height >>= 1;
|
||||
|
||||
WP(w,vp_d).scrollpos_x += vp->virtual_width >> 1;
|
||||
WP(w,vp_d).scrollpos_y += vp->virtual_height >> 1;
|
||||
WP(w,vp_d).scrollpos_x += vp->virtual_width >> 1;
|
||||
WP(w,vp_d).scrollpos_y += vp->virtual_height >> 1;
|
||||
break;
|
||||
case ZOOM_OUT:
|
||||
if (vp->zoom == 2) return false;
|
||||
vp->zoom++;
|
||||
|
||||
SetWindowDirty(w);
|
||||
} else if (how == ZOOM_OUT) {
|
||||
if (vp->zoom == 2) return false;
|
||||
vp->zoom++;
|
||||
WP(w,vp_d).scrollpos_x -= vp->virtual_width >> 1;
|
||||
WP(w,vp_d).scrollpos_y -= vp->virtual_height >> 1;
|
||||
|
||||
WP(w,vp_d).scrollpos_x -= vp->virtual_width >> 1;
|
||||
WP(w,vp_d).scrollpos_y -= vp->virtual_height >> 1;
|
||||
|
||||
vp->virtual_width <<= 1;
|
||||
vp->virtual_height <<= 1;
|
||||
|
||||
SetWindowDirty(w);
|
||||
vp->virtual_width <<= 1;
|
||||
vp->virtual_height <<= 1;
|
||||
break;
|
||||
default: return false;
|
||||
}
|
||||
|
||||
SetWindowDirty(w);
|
||||
|
||||
// routine to disable/enable the zoom buttons. Didn't know where to place these otherwise
|
||||
{
|
||||
Window *wt = NULL;
|
||||
|
||||
Reference in New Issue
Block a user