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

Changed width/height constraints in nsHTMLReflowState struct

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@16998 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
troy%netscape.com
1998-12-30 17:50:00 +00:00
parent 4659feb84c
commit c22f41cbf9
31 changed files with 308 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mozilla/layout/html/forms/src/nsFieldSetFrame.cpp
View File

@@ -276,7 +276,7 @@ nsFieldSetFrame::Reflow(nsIPresContext& aPresContext,
legendMargin.left + legendMargin.right;
nscoord verTaken = padding.top + borderPadding.bottom + legendMargin.top + legendMargin.bottom;
if (aReflowState.HaveFixedContentWidth()) {
availSize.width = aReflowState.minWidth;
availSize.width = aReflowState.computedWidth;
}
else {
if (NS_UNCONSTRAINEDSIZE != availSize.width)
@@ -356,8 +356,8 @@ nsFieldSetFrame::Reflow(nsIPresContext& aPresContext,
nscoord contentWidth = contentSize.width + borderPadding.left + borderPadding.right;
aDesiredSize.width = (legendWidth > contentWidth) ? legendWidth : contentWidth;
if (aReflowState.HaveFixedContentWidth() && (aReflowState.minWidth > aDesiredSize.width)) {
aDesiredSize.width = aReflowState.minWidth;
if (aReflowState.HaveFixedContentWidth() && (aReflowState.computedWidth > aDesiredSize.width)) {
aDesiredSize.width = aReflowState.computedWidth;
}
// Place the legend
@@ -419,8 +419,8 @@ nsFieldSetFrame::Reflow(nsIPresContext& aPresContext,
aDesiredSize.height = contentTopOffset + contentSize.height + borderPadding.bottom;
if (mInline) // XXX parents don't yet ......
aDesiredSize.height += margin.bottom;
if (aReflowState.HaveFixedContentHeight() && (aReflowState.minHeight > aDesiredSize.height)) {
aDesiredSize.height = aReflowState.minHeight;
if (aReflowState.HaveFixedContentHeight() && (aReflowState.computedHeight > aDesiredSize.height)) {
aDesiredSize.height = aReflowState.computedHeight;
}
aDesiredSize.ascent = aDesiredSize.height;
aDesiredSize.descent = 0;