Merge branch 'work' into tomerge

This commit is contained in:
Tim Edwards 2017-09-26 14:09:49 -04:00
commit 892584c9c9
2 changed files with 31 additions and 0 deletions

View File

@ -1453,6 +1453,9 @@ void
DBScaleEverything(scalen, scaled)
int scalen, scaled;
{
void ToolScaleBox();
void DBWScaleCrosshair();
int dbCellDefEnumFunc();
LinkedCellDef *lhead, *lcd;
@ -1484,6 +1487,12 @@ DBScaleEverything(scalen, scaled)
/* Recovery of global plane pointers */
MZAttachHintPlanes();
/* Modify root box */
ToolScaleBox(scalen, scaled);
/* Modify crosshair position */
DBWScaleCrosshair(scalen, scaled);
SigEnableInterrupts();
}

View File

@ -191,6 +191,18 @@ ToolGetBox(rootDef, rootArea)
return TRUE;
}
/* ToolScaleBox --- Simple scaling of the root area box, no update needed */
void
ToolScaleBox(scalen, scaled)
int scalen;
int scaled;
{
DBScalePoint(&boxRootArea.r_ll, scalen, scaled);
DBScalePoint(&boxRootArea.r_ur, scalen, scaled);
}
/*
* ----------------------------------------------------------------------------
@ -474,6 +486,16 @@ DBWDrawCrosshair(window, plane)
window->w_screenArea.r_xtop, p.p_y);
}
/* DBWScaleCrosshair --- Simple scaling of the crosshair point, no update needed */
void
DBWScaleCrosshair(scalen, scaled)
int scalen;
int scaled;
{
DBScalePoint(&crosshairPos, scalen, scaled);
}
/*
* ----------------------------------------------------------------------------
* DBWSetCrosshair --