(svn r7093) -Codechange: Move DoZoomInOutWindow declaration to viewport.h and rewrite the function

a bit more sensibly.
This commit is contained in:
Darkvater
2006-11-07 13:01:36 +00:00
parent 45366b4372
commit e90bc1681f
3 changed files with 29 additions and 26 deletions

View File

@@ -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;