corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 1520 (www.mirabilis.com)

Browse Source 
the problem was the way table layout apportioned height from a rowspanning cell.
Now, we do 2 things correctly:
1) we handle rows with rowspanning cells and no other cells.
2) we divide the height of a rowspanning cell proportionately to the rows spanned, where the proportion is defined by
the max height of a cell in that row that has no effective rowspan.

the partial fix for bug 1431 has to do with dividing width between percent-width and fixed-width columns in the same
table. You won't see any better layout for this page (ww.boston.com) as a result of the code I added.  The rest of this
fix is a bit risky, so I'm waiting until after stability push.
This commit is contained in:
buster@netscape.com
1998-11-24 19:41:33 +00:00
parent c9af67001f
commit 02b9e1c81a
6 changed files with 148 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
layout/tables/BasicTableLayoutStrategy.cpp
View File

@@ -2196,7 +2196,8 @@ void BasicTableLayoutStrategy::DistributeRemainingSpace(nscoord aTableSpecified
void BasicTableLayoutStrategy::AdjustTableThatIsTooWide(nscoord aComputedWidth,
nscoord aTableWidth, PRBool aShrinkFixedCols)
nscoord aTableWidth,
PRBool aShrinkFixedCols)
{
if (PR_TRUE==gsDebug)
{
@@ -2213,6 +2214,9 @@ void BasicTableLayoutStrategy::AdjustTableThatIsTooWide(nscoord aComputedWidth,
PRInt32 numFixedColumns=0;
PRInt32 *fixedColumns=nsnull;
mTableFrame->GetColumnsByType(eStyleUnit_Coord, numFixedColumns, fixedColumns);
PRInt32 numAutoColumns=0;
PRInt32 *autoColumns=nsnull;
mTableFrame->GetColumnsByType(eStyleUnit_Auto, numAutoColumns, autoColumns);
nscoord excess = aComputedWidth - aTableWidth;
nscoord minDiff; // the smallest non-zero delta between a column's current width and its min width
PRInt32 * colsToShrink = new PRInt32[mNumCols];
@@ -2225,24 +2229,37 @@ void BasicTableLayoutStrategy::AdjustTableThatIsTooWide(nscoord aComputedWidth,
colsToShrink[colIndex]=0;
minDiff=0;
// determine what columns we can take remove width from
// determine what columns we can remove width from
PRInt32 numColsToShrink = 0;
for (colIndex=0; colIndex<mNumCols; colIndex++)
PRBool shrinkAutoOnly=PR_TRUE;
PRBool keepLooking=PR_TRUE;
while (PR_TRUE==keepLooking)
{
nscoord currentColWidth = mTableFrame->GetColumnWidth(colIndex);
nsTableColFrame *colFrame;
mTableFrame->GetColumnFrame(colIndex, colFrame);
nscoord minColWidth = colFrame->GetMinColWidth();
if (currentColWidth==minColWidth)
continue;
if ((PR_FALSE==aShrinkFixedCols) &&
(PR_TRUE==IsColumnInList(colIndex, fixedColumns, numFixedColumns)))
continue;
colsToShrink[numColsToShrink] = colIndex;
numColsToShrink++;
nscoord diff = currentColWidth - minColWidth;
if ((0==minDiff) || (diff<minDiff))
minDiff = diff;
for (colIndex=0; colIndex<mNumCols; colIndex++)
{
nscoord currentColWidth = mTableFrame->GetColumnWidth(colIndex);
nsTableColFrame *colFrame;
mTableFrame->GetColumnFrame(colIndex, colFrame);
nscoord minColWidth = colFrame->GetAdjustedMinColWidth();
if (currentColWidth==minColWidth)
continue;
if ((PR_FALSE==aShrinkFixedCols) &&
(PR_TRUE==IsColumnInList(colIndex, fixedColumns, numFixedColumns)))
continue;
if ((PR_TRUE==shrinkAutoOnly) &&
(PR_FALSE==IsColumnInList(colIndex, autoColumns, numAutoColumns)))
continue;
colsToShrink[numColsToShrink] = colIndex;
numColsToShrink++;
nscoord diff = currentColWidth - minColWidth;
if ((0==minDiff) || (diff<minDiff))
minDiff = diff;
}
if (PR_FALSE==shrinkAutoOnly)
keepLooking=PR_FALSE; // we've looked everywhere, so bail. this breaks us out of the loop
if (0!=numColsToShrink)
keepLooking=PR_FALSE; // we found at least one column to shrink, so bail. this breaks us out of the loop
shrinkAutoOnly=PR_FALSE;// this guarantees we'll go through this loop only one more time
}
// if there are no columns we can remove space from, we're done
if (0==numColsToShrink)