Don't carry out the bottom margins of kids if the block's height is affected by

min-height or max-height.  Bug 295309, r+sr=roc, a=bsmedberg


git-svn-id: svn://10.0.0.236/trunk@176971 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzbarsky%mit.edu 2005-08-02 14:32:46 +00:00
parent 236e5ac36b
commit a76c585865

View File

@ -1403,7 +1403,13 @@ nsBlockFrame::ComputeFinalSize(const nsHTMLReflowState& aReflowState,
// Apply min/max values
autoHeight -= borderPadding.top;
nscoord oldAutoHeight = autoHeight;
aReflowState.ApplyMinMaxConstraints(nsnull, &autoHeight);
if (autoHeight != oldAutoHeight) {
// Our min-height or max-height made our height change. Don't carry out
// our kids' bottom margins.
aMetrics.mCarriedOutBottomMargin.Zero();
}
autoHeight += borderPadding.top + borderPadding.bottom;
aMetrics.height = autoHeight;
}