зеркало из https://github.com/mozilla/gecko-dev.git
bug 76848: Regression in handling global fonts
setting logfont parameters r=ftang sr=blizzard
This commit is contained in:
Родитель
cf542e63dd
Коммит
a108d9c59d
|
@ -1920,7 +1920,9 @@ nsFontMetricsWin::LoadGlobalFont(HDC aDC, nsGlobalFont* aGlobalFontItem)
|
|||
LOGFONT logFont;
|
||||
HFONT hfont;
|
||||
|
||||
FillLogFont(&logFont, aGlobalFontItem->logFont.lfWeight);
|
||||
PRUint16 weightTable = LookForFontWeightTable(aDC, aGlobalFontItem->name);
|
||||
PRInt32 weight = GetFontWeight(mFont->weight, weightTable);
|
||||
FillLogFont(&logFont, weight);
|
||||
logFont.lfCharSet = aGlobalFontItem->logFont.lfCharSet;
|
||||
logFont.lfPitchAndFamily = aGlobalFontItem->logFont.lfPitchAndFamily;
|
||||
strcpy(logFont.lfFaceName, aGlobalFontItem->logFont.lfFaceName);;
|
||||
|
@ -4171,7 +4173,9 @@ nsFontMetricsWinA::LoadGlobalFont(HDC aDC, nsGlobalFont* aGlobalFontItem)
|
|||
LOGFONT logFont;
|
||||
HFONT hfont;
|
||||
|
||||
FillLogFont(&logFont, aGlobalFontItem->logFont.lfWeight);
|
||||
PRUint16 weightTable = LookForFontWeightTable(aDC, aGlobalFontItem->name);
|
||||
PRInt32 weight = GetFontWeight(mFont->weight, weightTable);
|
||||
FillLogFont(&logFont, weight);
|
||||
logFont.lfCharSet = aGlobalFontItem->logFont.lfCharSet;
|
||||
logFont.lfPitchAndFamily = aGlobalFontItem->logFont.lfPitchAndFamily;
|
||||
strcpy(logFont.lfFaceName, aGlobalFontItem->logFont.lfFaceName);;
|
||||
|
|
Загрузка…
Ссылка в новой задаче