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

Tweaked to handle updated line-height calculation code that will now return -1 sometimes

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@29986 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kipp%netscape.com 1999-05-03 20:54:11 +00:00
parent 95141d3623
commit 31352557b2
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mozilla/layout/generic/nsLineLayout.cpp
View File

@ -1538,9 +1538,16 @@ nsLineLayout::VerticalAlignFrames(PerSpanData* psd)
nsHTMLReflowState::CalcLineHeight(mPresContext, parentFrame);
nscoord contentHeight = parentPFD->mBounds.height -
parentPFD->mBorderPadding.top - parentPFD->mBorderPadding.bottom;
nscoord leading = logicalHeight - contentHeight;
psd->mTopLeading = leading / 2;
psd->mBottomLeading = leading - psd->mTopLeading;
if (logicalHeight > 0) {
nscoord leading = logicalHeight - contentHeight;
psd->mTopLeading = leading / 2;
psd->mBottomLeading = leading - psd->mTopLeading;
}
else {
psd->mTopLeading = 0;
psd->mBottomLeading = 0;
logicalHeight = contentHeight;
}
psd->mLogicalHeight = logicalHeight;
// The initial values for the min and max Y values are in the spans

13
mozilla/layout/html/base/src/nsLineLayout.cpp
View File

@ -1538,9 +1538,16 @@ nsLineLayout::VerticalAlignFrames(PerSpanData* psd)
nsHTMLReflowState::CalcLineHeight(mPresContext, parentFrame);
nscoord contentHeight = parentPFD->mBounds.height -
parentPFD->mBorderPadding.top - parentPFD->mBorderPadding.bottom;
nscoord leading = logicalHeight - contentHeight;
psd->mTopLeading = leading / 2;
psd->mBottomLeading = leading - psd->mTopLeading;
if (logicalHeight > 0) {
nscoord leading = logicalHeight - contentHeight;
psd->mTopLeading = leading / 2;
psd->mBottomLeading = leading - psd->mTopLeading;
}
else {
psd->mTopLeading = 0;
psd->mBottomLeading = 0;
logicalHeight = contentHeight;
}
psd->mLogicalHeight = logicalHeight;
// The initial values for the min and max Y values are in the spans