mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-10 03:45:46 +00:00
Bug 109176 Japanese hiragino text slided up within big button/drop-menu/... patch by Hideo Saito <saito@densan.co.jp> r=joshmoz, sr=roc
This commit is contained in:
parent
788aba6938
commit
6fb6b4c4c6
@ -95,7 +95,7 @@ NS_IMETHODIMP nsFontMetricsMac::Init(const nsFont& aFont, nsIAtom* aLangGroup, n
|
|||||||
mEmDescent = NSToCoordRound(float(fInfo.descent) * dev2app);
|
mEmDescent = NSToCoordRound(float(fInfo.descent) * dev2app);
|
||||||
mEmHeight = mEmAscent + mEmDescent;
|
mEmHeight = mEmAscent + mEmDescent;
|
||||||
|
|
||||||
mMaxHeight = mEmHeight + mLeading;
|
mMaxHeight = mEmHeight;
|
||||||
mMaxAscent = mEmAscent;
|
mMaxAscent = mEmAscent;
|
||||||
mMaxDescent = mEmDescent;
|
mMaxDescent = mEmDescent;
|
||||||
|
|
||||||
@ -309,7 +309,7 @@ NS_IMETHODIMP nsFontMetricsMac :: GetHeight(nscoord &aHeight)
|
|||||||
|
|
||||||
NS_IMETHODIMP nsFontMetricsMac :: GetNormalLineHeight(nscoord &aHeight)
|
NS_IMETHODIMP nsFontMetricsMac :: GetNormalLineHeight(nscoord &aHeight)
|
||||||
{
|
{
|
||||||
aHeight = mMaxHeight; // on Windows, it's mEmHeight + mLeading (= mMaxHeight on the Mac)
|
aHeight = mEmHeight + mLeading; // Mac's leading is external leading
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user