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

ignore overflow containers when balancing, b=399407, r+sr=roc a=beltzner

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@239216 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
fantasai.cvs%inkedblade.net 2007-11-12 19:00:59 +00:00
parent 3ba09bcb04
commit 7ce523d36b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mozilla/layout/generic/nsColumnSetFrame.cpp
View File

@ -438,7 +438,7 @@ nsColumnSetFrame::ReflowChildren(nsHTMLReflowMetrics& aDesiredSize,
#endif
}
}
int columnCount = 0;
int columnCount = 0; // ignores overflow container columns; they don't affect balancing
PRBool reflowNext = PR_FALSE;
while (child) {
@ -549,7 +549,8 @@ nsColumnSetFrame::ReflowChildren(nsHTMLReflowMetrics& aDesiredSize,
NS_ASSERTION(!kidNextInFlow, "next in flow should have been deleted");
break;
} else {
++columnCount;
if (NS_FRAME_IS_NOT_COMPLETE(aStatus)) // don't increment for overflow containers
++columnCount;
// Make sure that the column has a next-in-flow. If not, we must
// create one to hold the overflowing stuff, even if we're just
// going to put it on our overflow list and let *our*