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

#140754

Browse Source 
r=mkaply, sr=blizzard
OS/2 only - remove mPixelScale - use mCPixelScale - fix print preview scaling
This commit is contained in:
mkaply%us.ibm.com 2002-05-02 21:12:28 +00:00
parent 462217172b
commit ba8e19a01b
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gfx/src/os2/nsDeviceContextOS2.cpp
View File

@ -61,7 +61,6 @@ nsDeviceContextOS2 :: nsDeviceContextOS2()
mPaletteInfo.palette = NULL;
#endif
mPrintDC = NULL;
mPixelScale = 1.0f;
mWidth = -1;
mHeight = -1;
mSpec = nsnull;
@ -149,7 +148,7 @@ nsresult nsDeviceContextOS2::Init( nsNativeDeviceContext aContext,
// aOrigContext->GetTwipsToDevUnits( origscale);
origscale = 1.0/15.0;
mPixelScale = newscale / origscale;
mCPixelScale = newscale / origscale;
aOrigContext->GetTwipsToDevUnits( t2d);
aOrigContext->GetAppUnitsToDevUnits( a2d);
@ -165,7 +164,7 @@ nsresult nsDeviceContextOS2::Init( nsNativeDeviceContext aContext,
// XXX hsb says there are margin problems, must be from here...
#ifdef DEBUG
printf( "Got surface of size %d x %d pixels (%d Kb)\n", mWidth, mHeight, mWidth * mHeight * mDepth / 8 / 1024);
printf( "mPixelScale = %f\n", mPixelScale);
printf( "mCPixelScale = %f\n", mCPixelScale);
#endif
#endif
@ -338,16 +337,9 @@ NS_IMETHODIMP nsDeviceContextOS2 :: SupportsNativeWidgets(PRBool &aSupportsWidge
return NS_OK;
}
NS_IMETHODIMP nsDeviceContextOS2 :: GetCanonicalPixelScale(float &aScale) const
{
aScale = mPixelScale;
return NS_OK;
}
NS_IMETHODIMP nsDeviceContextOS2 :: GetScrollBarDimensions(float &aWidth, float &aHeight) const
{
float scale;
GetCanonicalPixelScale(scale);
float scale = mCPixelScale;
aWidth = ::WinQuerySysValue( HWND_DESKTOP, SV_CXVSCROLL) * mDevUnitsToAppUnits * scale;
aHeight = ::WinQuerySysValue( HWND_DESKTOP, SV_CYHSCROLL) * mDevUnitsToAppUnits * scale;
return NS_OK;

3
gfx/src/os2/nsDeviceContextOS2.h
View File

@ -58,8 +58,6 @@ public:
NS_IMETHOD SupportsNativeWidgets(PRBool &aSupportsWidgets);
NS_IMETHOD GetCanonicalPixelScale(float &aScale) const;
NS_IMETHOD GetScrollBarDimensions(float &aWidth, float &aHeight) const;
NS_IMETHOD GetSystemFont(nsSystemFontID anID, nsFont *aFont) const;
@ -115,7 +113,6 @@ protected:
#ifdef COLOR_256
nsPaletteInfo mPaletteInfo;
#endif
float mPixelScale;
PRInt32 mWidth;
PRInt32 mHeight;
nsRect mClientRect;