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

#267862

Browse Source 
r=mkaply, sr=blizzard (platform specific), a=mkaply (OS/2 only)
Patch from Javier Pedemonte - fix some subtle font issues


git-svn-id: svn://10.0.0.236/trunk@165579 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mkaply%us.ibm.com
2004-11-22 18:16:11 +00:00
parent 297ccd69e5
commit ca72d78026
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -657,10 +657,11 @@ nsFontMetricsOS2::LoadFont(HPS aPS, const nsAString& aFontname)
FONTMETRICS* pMetrics = getMetrics(lFonts, facename.get(), aPS);
if (lFonts > 0) {
nsAutoString familyname;
CopyASCIItoUCS2(nsDependentCString(pMetrics[0].szFamilyname),
familyname);
GlobalFontEntry* globalEntry = gGlobalFonts->GetEntry(familyname);
nsAutoChar16Buffer familyname;
MultiByteToWideChar(0, pMetrics[0].szFamilyname,
strlen(pMetrics[0].szFamilyname), familyname, len);
nsAutoString name(familyname.get());
GlobalFontEntry* globalEntry = gGlobalFonts->GetEntry(name);
if (globalEntry) {
// Look through metrics for one that matches given facename
nsMiniMetrics* metrics = globalEntry->mMetrics;
@@ -805,19 +806,21 @@ nsFontMetricsOS2::InitializeGlobalFonts()
// 'italic', 'oblique', 'regular'). If the Facename contains
// one of these indicators, then we will create the sort key
// based on the Familyname. Otherwise, use the Facename.
nsAutoString fontptr;
char* f;
if (PL_strcasestr(font->szFacename, "bold") != nsnull ||
PL_strcasestr(font->szFacename, "italic") != nsnull ||
PL_strcasestr(font->szFacename, "oblique") != nsnull ||
PL_strcasestr(font->szFacename, "regular") != nsnull ||
PL_strcasestr(font->szFacename, "-normal") != nsnull)
{
CopyASCIItoUCS2(nsDependentCString(NS_STATIC_CAST(char*, font->szFamilyname)),
fontptr);
f = NS_STATIC_CAST(char*, font->szFamilyname);
} else {
CopyASCIItoUCS2(nsDependentCString(NS_STATIC_CAST(char*, font->szFacename)),
fontptr);
f = NS_STATIC_CAST(char*, font->szFacename);
}
nsAutoChar16Buffer fontname;
PRInt32 len;
MultiByteToWideChar(0, f, strlen(f), fontname, len);
nsAutoString fontptr(fontname.get());
// The fonts in gBadDBCSFontMapping do not display well in non-Chinese
// systems. Map them to a more intelligible name.
@@ -828,8 +831,7 @@ nsFontMetricsOS2::InitializeGlobalFonts()
(gSystemCodePage != 950))
{
for (int i = 0; gBadDBCSFontMapping[i].mName != nsnull; i++) {
if (fontptr.Equals(NS_ConvertASCIItoUCS2(gBadDBCSFontMapping[i].mName),
nsCaseInsensitiveStringComparator()))
if (strcmp(f, gBadDBCSFontMapping[i].mName) == 0)
{
CopyASCIItoUCS2(nsDependentCString(gBadDBCSFontMapping[i].mWinName),
fontptr);
@@ -1685,8 +1687,11 @@ nsFontMetricsOS2::FindWesternFont()
// Create a 'western' font by making a copy of the currently selected font
// and changing the codepage 1252
nsFontOS2* font = new nsFontOS2();
*font = *mFontHandle;
font->mFattrs = mFontHandle->mFattrs;
font->mFattrs.usCodePage = 1252;
font->mCharbox = mFontHandle->mCharbox;
font->mMaxAscent = mFontHandle->mMaxAscent;
font->mMaxDescent = mFontHandle->mMaxDescent;
font->mConvertCodePage = 1252;
mLoadedFonts.AppendElement(font);
mWesternFont = font;