зеркало из https://github.com/mozilla/pjs.git
No bug
r=mkaply, a=blizzard Timing trap related to destroying windows and nice fix for height of fonts
This commit is contained in:
Родитель
aaad4caae1
Коммит
bf7387bf32
|
@ -600,6 +600,9 @@ HDC ps = NULL;
|
|||
} else {
|
||||
win = (HWND)mDeviceContext->mWidget;
|
||||
ps = ::WinGetPS(win);
|
||||
if (!ps) {
|
||||
ps = ::WinGetPS(HWND_DESKTOP);
|
||||
} /* endif */
|
||||
}
|
||||
|
||||
mFont->EnumerateFamilies(FontEnumCallback, this);
|
||||
|
@ -954,7 +957,7 @@ NS_IMETHODIMP nsFontMetricsOS2::GetLangGroup(nsIAtom** aLangGroup)
|
|||
NS_IMETHODIMP
|
||||
nsFontMetricsOS2::GetNormalLineHeight(nscoord &aHeight)
|
||||
{
|
||||
aHeight = mEmHeight + mLeading;
|
||||
aHeight = mEmDescent + mEmAscent + mLeading;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче