Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 03:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix bug 156943. add cjk lang group check for mUnderlineSize computation

Browse Source 
r=rbs sr=jst a=chofmann
This commit is contained in:
ftang%netscape.com 2002-07-23 20:35:31 +00:00
parent 39a6f7b756
commit 8deae88f6a
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gfx/src/windows/nsFontMetricsWin.cpp
View File

@ -3284,9 +3284,16 @@ nsFontMetricsWin::RealizeFont()
mStrikeoutOffset = NSToCoordRound(oMetrics.otmsStrikeoutPosition * dev2app);
mUnderlineSize = PR_MAX(onePixel, NSToCoordRound(oMetrics.otmsUnderscoreSize * dev2app));
if (gDoingLineheightFixup) {
mUnderlineOffset = NSToCoordRound(PR_MIN(oMetrics.otmsUnderscorePosition, oMetrics.otmDescent + oMetrics.otmsUnderscoreSize) * dev2app);
// keep descent position, use it for mUnderlineOffset if leading allows
descentPos = NSToCoordRound(oMetrics.otmDescent * dev2app);
if(IsCJKLangGroupAtom(mLangGroup.get())) {
mUnderlineOffset = NSToCoordRound(PR_MIN(oMetrics.otmsUnderscorePosition,
oMetrics.otmDescent + oMetrics.otmsUnderscoreSize)
* dev2app);
// keep descent position, use it for mUnderlineOffset if leading allows
descentPos = NSToCoordRound(oMetrics.otmDescent * dev2app);
} else {
mUnderlineOffset = NSToCoordRound(PR_MIN(oMetrics.otmsUnderscorePosition*dev2app,
oMetrics.otmDescent*dev2app + mUnderlineSize));
}
}
else
mUnderlineOffset = NSToCoordRound(oMetrics.otmsUnderscorePosition * dev2app);