Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#176609

Browse Source 
r=mkaply, sr=blizzard (platform specific code)
OS/2 only - use browser DPI for bitmap fonts as well


git-svn-id: svn://10.0.0.236/trunk@133841 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mkaply%us.ibm.com
2002-11-14 19:53:20 +00:00
parent 08d338442b
commit 257efbef6c
3 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mozilla/gfx/src/os2/nsDeviceContextOS2.h
View File

@@ -99,6 +99,7 @@ public:
// Static Helper Methods
static char* GetACPString(const nsString& aStr);
nsresult SetDPI(PRInt32 aPrefDPI);
int GetDPI() { return mDpi; };
protected:
virtual ~nsDeviceContextOS2();

10
mozilla/gfx/src/os2/nsFontMetricsOS2.cpp
View File

@@ -68,7 +68,6 @@ static NS_DEFINE_CID(kLocaleServiceCID, NS_LOCALESERVICE_CID);
nsVoidArray *nsFontMetricsOS2::gGlobalFonts = nsnull;
PRBool nsFontMetricsOS2::gSubstituteVectorFonts = PR_TRUE;
PLHashTable *nsFontMetricsOS2::gFamilyNames = nsnull;
long nsFontMetricsOS2::gSystemRes = 0;
int nsFontMetricsOS2::gCachedIndex = 0;
nsICollation *nsFontMetricsOS2::gCollation = nsnull;
@@ -387,12 +386,6 @@ InitGlobals(void)
ulSystemCodePage = WinQueryCp(HMQ_CURRENT);
// find system screen resolution. used here and in RealizeFont
HPS ps = ::WinGetScreenPS(HWND_DESKTOP);
HDC hdc = GFX (::GpiQueryDevice (ps), HDC_ERROR);
GFX (::DevQueryCaps(hdc, CAPS_HORIZONTAL_FONT_RES, 1, &nsFontMetricsOS2::gSystemRes), FALSE);
::WinReleasePS(ps);
if( !nsFontMetricsOS2::gGlobalFonts )
{
nsresult res = nsFontMetricsOS2::InitializeGlobalFonts();
@@ -541,11 +534,12 @@ nsFontMetricsOS2::SetFontHandle( HPS aPS, nsFontOS2* aFont )
{
long lFonts = 0;
FONTMETRICS* pMetrics = getMetrics( lFonts, fattrs->szFacename, aPS);
int browserRes = mDeviceContext->GetDPI();
int curPoints = 0;
for( int i = 0; i < lFonts; i++)
{
if( pMetrics[i].sYDeviceRes == gSystemRes )
if( pMetrics[i].sYDeviceRes == browserRes )
{
if (pMetrics[i].sNominalPointSize / 10 == points)
{

1
mozilla/gfx/src/os2/nsFontMetricsOS2.h
View File

@@ -198,7 +198,6 @@ class nsFontMetricsOS2 : public nsIFontMetrics
static nsVoidArray* gGlobalFonts;
static PLHashTable* gFamilyNames;
static long gSystemRes;
static nsICollation* gCollation;
nsStringArray mFonts;