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

fixed nsbeta2+ bugs 42138 35772 37657 38157 40283 35964

Browse Source 
r=waterson, rods


git-svn-id: svn://10.0.0.236/trunk@72241 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
buster%netscape.com
2000-06-14 23:15:59 +00:00
parent f18c290ffb
commit e8833a517e
12 changed files with 362 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -558,19 +558,30 @@ nsLineLayout::EndSpan(nsIFrame* aFrame,
width = psd->mX - psd->mLeftEdge;
PerFrameData* pfd = psd->mFirstFrame;
while (nsnull != pfd) {
if (pfd->mBounds.height > maxHeight) maxHeight = pfd->mBounds.height;
/* there's one oddball case we need to guard against
* if we're reflowed with NS_UNCONSTRAINEDSIZE
* then the last frame will not contribute to the max element size height
* if it is a text frame that only contains whitespace
*/
if (NS_UNCONSTRAINEDSIZE != psd->mRightEdge || // it's not an unconstrained reflow
pfd->mNext || // or it's not the last frame in the span
!pfd->GetFlag(PFD_ISTEXTFRAME) || // or it's not a text frame
pfd->GetFlag(PFD_ISNONWHITESPACETEXTFRAME) // or it contains something other than whitespace
) {
if (pfd->mBounds.height > maxHeight) maxHeight = pfd->mBounds.height;
// Compute max-element-size if necessary
if (aMaxElementSize) {
nscoord mw = pfd->mMaxElementSize.width +
pfd->mMargin.left + pfd->mMargin.right;
if (maxElementWidth < mw) {
maxElementWidth = mw;
}
nscoord mh = pfd->mMaxElementSize.height +
pfd->mMargin.top + pfd->mMargin.bottom;
if (maxElementHeight < mh) {
maxElementHeight = mh;
// Compute max-element-size if necessary
if (aMaxElementSize) {
nscoord mw = pfd->mMaxElementSize.width +
pfd->mMargin.left + pfd->mMargin.right;
if (maxElementWidth < mw) {
maxElementWidth = mw;
}
nscoord mh = pfd->mMaxElementSize.height +
pfd->mMargin.top + pfd->mMargin.bottom;
if (maxElementHeight < mh) {
maxElementHeight = mh;
}
}
}
pfd = pfd->mNext;
@@ -1627,8 +1638,13 @@ nsLineLayout::VerticalAlignFrames(nsLineBox* aLineBox,
if (mComputeMaxElementSize) {
nscoord mw = pfd->mMaxElementSize.width +
pfd->mMargin.left + pfd->mMargin.right;
if (maxElementWidth < mw) {
maxElementWidth = mw;
if (psd->mNoWrap) {
maxElementWidth += mw;
}
else {
if (maxElementWidth < mw) {
maxElementWidth = mw;
}
}
nscoord mh = pfd->mMaxElementSize.height +
pfd->mMargin.top + pfd->mMargin.bottom;