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

height member of gfxFontMetrics is no longer used.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@207374 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
pavlov%pavlov.net
2006-08-14 21:48:24 +00:00
parent c21c19600d
commit b1c84eed3d
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mozilla/gfx/thebes/src/gfxAtsuiFonts.cpp
View File

@@ -122,13 +122,12 @@ gfxAtsuiFont::gfxAtsuiFont(ATSUFontID fontID,
mMetrics.maxAscent = atsMetrics.ascent * size;
mMetrics.maxDescent = - (atsMetrics.descent * size);
mMetrics.height = mMetrics.maxAscent + mMetrics.maxDescent;
mMetrics.internalLeading = atsMetrics.leading * size;
mMetrics.externalLeading = 0.0;
mMetrics.maxHeight = mMetrics.height;
mMetrics.emAscent = mMetrics.maxAscent * mMetrics.emHeight / mMetrics.height;
mMetrics.maxHeight = mMetrics.maxAscent + mMetrics.maxDescent;
mMetrics.emAscent = mMetrics.maxAscent * mMetrics.emHeight / mMetrics.maxHeight;
mMetrics.emDescent = mMetrics.emHeight - mMetrics.emAscent;
mMetrics.maxAdvance = atsMetrics.maxAdvanceWidth * size;
@@ -154,7 +153,7 @@ gfxAtsuiFont::gfxAtsuiFont(ATSUFontID fontID,
fprintf (stderr, "Font: %p size: %f", this, size);
fprintf (stderr, " emHeight: %f emAscent: %f emDescent: %f\n", mMetrics.emHeight, mMetrics.emAscent, mMetrics.emDescent);
fprintf (stderr, " maxAscent: %f maxDescent: %f maxAdvance: %f\n", mMetrics.maxAscent, mMetrics.maxDescent, mMetrics.maxAdvance);
fprintf (stderr, " height: %f internalLeading: %f externalLeading: %f\n", mMetrics.height, mMetrics.externalLeading, mMetrics.internalLeading);
fprintf (stderr, " internalLeading: %f externalLeading: %f\n", mMetrics.externalLeading, mMetrics.internalLeading);
fprintf (stderr, " spaceWidth: %f aveCharWidth: %f xHeight: %f\n", mMetrics.spaceWidth, mMetrics.aveCharWidth, mMetrics.xHeight);
fprintf (stderr, " uOff: %f uSize: %f stOff: %f stSize: %f suOff: %f suSize: %f\n", mMetrics.underlineOffset, mMetrics.underlineSize, mMetrics.strikeoutOffset, mMetrics.strikeoutSize, mMetrics.superscriptOffset, mMetrics.subscriptOffset);
#endif