Replace computation of max-element-size (height and width) with max-element-width alone, since the max-element-height is practically unused and not meaningful for layout. b=186953 r+sr=bzbarsky

git-svn-id: svn://10.0.0.236/trunk@136064 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dbaron%dbaron.org
2003-01-09 14:26:32 +00:00
parent 1c7f8e98ea
commit a569c670f5
115 changed files with 1120 additions and 1524 deletions

View File

@@ -299,7 +299,7 @@ nsMathMLmfencedFrame::doReflow(nsIPresContext* aPresContext,
PRInt32 count = 0;
nsReflowStatus childStatus;
nsSize availSize(aReflowState.mComputedWidth, aReflowState.mComputedHeight);
nsHTMLReflowMetrics childDesiredSize(aDesiredSize.maxElementSize,
nsHTMLReflowMetrics childDesiredSize(aDesiredSize.mComputeMEW,
aDesiredSize.mFlags | NS_REFLOW_CALC_BOUNDING_METRICS);
nsIFrame* firstChild;
aForFrame->FirstChild(aPresContext, nsnull, &firstChild);
@@ -382,6 +382,9 @@ nsMathMLmfencedFrame::doReflow(nsIPresContext* aPresContext,
STRETCH_CONSIDER_EMBELLISHMENTS,
stretchDir, containerSize);
}
if (aDesiredSize.mComputeMEW) {
aDesiredSize.mMaxElementWidth = childDesiredSize.mMaxElementWidth;
}
//////////////////////////////////////////
// Prepare the opening fence, separators, and closing fence, and
@@ -462,9 +465,8 @@ nsMathMLmfencedFrame::doReflow(nsIPresContext* aPresContext,
aDesiredSize.width = aDesiredSize.mBoundingMetrics.width;
aDesiredSize.height = aDesiredSize.ascent + aDesiredSize.descent;
if (aDesiredSize.maxElementSize) {
aDesiredSize.maxElementSize->width = aDesiredSize.width;
aDesiredSize.maxElementSize->height = aDesiredSize.height;
if (aDesiredSize.mComputeMEW) {
aDesiredSize.mMaxElementWidth = aDesiredSize.width;
}
mathMLFrame->SetBoundingMetrics(aDesiredSize.mBoundingMetrics);