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

Changed interface nsIFontMetrics to use the XPCOM conventions for returning

Browse Source 
a nsresult


git-svn-id: svn://10.0.0.236/trunk@8785 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
troy%netscape.com
1998-08-29 02:34:34 +00:00
parent 6edcfe6a82
commit 1568e2814d
24 changed files with 306 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mozilla/content/html/style/src/nsCSSLayout.cpp
View File

@@ -70,6 +70,7 @@ nsCSSLayout::VerticallyAlignChildren(nsIPresContext* aCX,
nscoord kidYTop = 0;
PRBool isPass2Kid = PR_FALSE;
nscoord fontHeight, fontAscent, fontDescent;
switch (verticalAlignUnit) {
case eStyleUnit_Coord:
kidYTop = aMaxAscent + textStyle->mVerticalAlign.GetCoordValue();
@@ -115,15 +116,18 @@ nsCSSLayout::VerticallyAlignChildren(nsIPresContext* aCX,
case NS_STYLE_VERTICAL_ALIGN_MIDDLE:
// XXX spec says use the 'x' height but our font api
// doesn't give us that information.
kidYTop = aMaxAscent - (fm->GetHeight() / 2) - kidRect.height/2;
fm->GetHeight(fontHeight);
kidYTop = aMaxAscent - (fontHeight / 2) - kidRect.height/2;
break;
case NS_STYLE_VERTICAL_ALIGN_TEXT_BOTTOM:
kidYTop = aMaxAscent + fm->GetMaxDescent() - kidRect.height;
fm->GetMaxDescent(fontDescent);
kidYTop = aMaxAscent + fontDescent - kidRect.height;
break;
case NS_STYLE_VERTICAL_ALIGN_TEXT_TOP:
kidYTop = aMaxAscent - fm->GetMaxAscent();
fm->GetMaxAscent(fontAscent);
kidYTop = aMaxAscent - fontAscent;
break;
}