Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 04:15:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed margins r=rods

Browse Source
This commit is contained in:
rods%netscape.com 2000-02-01 22:39:18 +00:00
parent 9d08df3b73
commit a3080c6594
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gfx/src/ps/nsDeviceContextPS.cpp
View File

@ -251,13 +251,18 @@ NS_IMETHODIMP nsDeviceContextPS::GetDeviceSurfaceDimensions(PRInt32 &aWidth, PRI
nsIDeviceContextSpecPS *psSpec;
nsresult res;
float width, height;
float top,left,right,bottom;
if ( nsnull != mSpec ) {
res = mSpec->QueryInterface(kIDeviceContextSpecPSIID, (void **) &psSpec);
if ( res == NS_OK ) {
psSpec->GetPageDimensions( width, height );
aWidth = NSToIntRound((72.0f*width) * mDevUnitsToAppUnits);
aHeight = NSToIntRound((72.0f*height) * mDevUnitsToAppUnits);
psSpec->GetTopMargin(top);
psSpec->GetRightMargin(right);
psSpec->GetLeftMargin(left);
psSpec->GetBottomMargin(bottom);
aWidth = NSToIntRound((72.0f*(width-(right+left))) * mDevUnitsToAppUnits);
aHeight = NSToIntRound((72.0f*(height-(bottom+top))) * mDevUnitsToAppUnits);
return NS_OK;
}
}

19
gfx/src/ps/nsPostScriptObj.cpp
View File

@ -134,6 +134,7 @@ nsPostScriptObj::Init( nsIDeviceContextSpecPS *aSpec )
aSpec->GetLeftMargin( left );
aSpec->GetRightMargin( right );
printf("\nPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPP\n");
printf( "top %f bottom %f left %f right %f\n", top, bottom, left, right );
aSpec->GetFirstPageFirst( isFirstPageFirst );
if ( isFirstPageFirst == PR_FALSE )
@ -173,6 +174,8 @@ printf( "top %f bottom %f left %f right %f\n", top, bottom, left, right );
aSpec->GetPageDimensions( fwidth, fheight );
mPrintSetup->width = (int)(fwidth * mPrintSetup->dpi);
mPrintSetup->height = (int)(fheight * mPrintSetup->dpi);
printf("\nPreWidth = %f PreHeight = %f\n",fwidth,fheight);
printf("\nWidth = %d Height = %d\n",mPrintSetup->width,mPrintSetup->height);
mPrintSetup->header = "header";
mPrintSetup->footer = "footer";
mPrintSetup->sizes = NULL;
@ -567,8 +570,10 @@ nsPostScriptObj::moveto(int x, int y)
y -= mPrintContext->prInfo->page_topy;
// invert y
y = (mPrintContext->prInfo->page_height - y - 1) + mPrintContext->prSetup->bottom;
// y = (mPrintContext->prInfo->page_height - y - 1) + mPrintContext->prSetup->bottom;
y = (mPrintContext->prInfo->page_height - y - 1);
XP_FilePrintf(mPrintContext->prSetup->out, "%g %g moveto\n",
PAGE_TO_POINT_F(x), PAGE_TO_POINT_F(y));
XL_RESTORE_NUMERIC_LOCALE();
@ -604,7 +609,8 @@ nsPostScriptObj::lineto( int aX1, int aY1)
XL_SET_NUMERIC_LOCALE();
aY1 -= mPrintContext->prInfo->page_topy;
aY1 = (mPrintContext->prInfo->page_height - aY1 - 1) + mPrintContext->prSetup->bottom;
//aY1 = (mPrintContext->prInfo->page_height - aY1 - 1) + mPrintContext->prSetup->bottom;
aY1 = (mPrintContext->prInfo->page_height - aY1 - 1) ;
XP_FilePrintf(mPrintContext->prSetup->out, "%g %g lineto\n",
PAGE_TO_POINT_F(aX1), PAGE_TO_POINT_F(aY1));
@ -749,9 +755,11 @@ nsPostScriptObj::line( int aX1, int aY1, int aX2, int aY2, int aThick)
XP_FilePrintf(mPrintContext->prSetup->out, "gsave %g setlinewidth\n ",PAGE_TO_POINT_F(aThick));
aY1 -= mPrintContext->prInfo->page_topy;
aY1 = (mPrintContext->prInfo->page_height - aY1 - 1) + mPrintContext->prSetup->bottom;
// aY1 = (mPrintContext->prInfo->page_height - aY1 - 1) + mPrintContext->prSetup->bottom;
aY1 = (mPrintContext->prInfo->page_height - aY1 - 1) ;
aY2 -= mPrintContext->prInfo->page_topy;
aY2 = (mPrintContext->prInfo->page_height - aY2 - 1) + mPrintContext->prSetup->bottom;
// aY2 = (mPrintContext->prInfo->page_height - aY2 - 1) + mPrintContext->prSetup->bottom;
aY2 = (mPrintContext->prInfo->page_height - aY2 - 1) ;
XP_FilePrintf(mPrintContext->prSetup->out, "%g %g moveto %g %g lineto\n",
PAGE_TO_POINT_F(aX1), PAGE_TO_POINT_F(aY1),
@ -812,7 +820,8 @@ nsPostScriptObj::translate(int x, int y)
XL_SET_NUMERIC_LOCALE();
y -= mPrintContext->prInfo->page_topy;
// Y inversion
y = (mPrintContext->prInfo->page_height - y - 1) + mPrintContext->prSetup->bottom;
//y = (mPrintContext->prInfo->page_height - y - 1) + mPrintContext->prSetup->bottom;
y = (mPrintContext->prInfo->page_height - y - 1) ;
XP_FilePrintf(mPrintContext->prSetup->out, "%g %g translate\n", PAGE_TO_POINT_F(x), PAGE_TO_POINT_F(y));
XL_RESTORE_NUMERIC_LOCALE();