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

better handling of non-cell frames in rowFrames

Browse Source 
support for the case where a nested table is in a cell that has colspan>1
This commit is contained in:
buster@netscape.com
1998-09-16 00:48:14 +00:00
parent c49b8e6ab0
commit 279673f032
8 changed files with 304 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
layout/tables/BasicTableLayoutStrategy.cpp
View File

@@ -206,6 +206,8 @@ PRBool BasicTableLayoutStrategy::BalanceColumnWidths(nsIStyleContext *aTableStyl
availWidth = specifiedTableWidth - mFixedTableWidth; // use it, minus the fixed columns already accounted for
//if (0!=mMinTableWidth && mMinTableWidth>availWidth) // if the computed available size is too small
//availWidth = mMinTableWidth; // bump it up to the min
if (0>availWidth) // avail width can never be negative
availWidth=0;
// Step 3 - assign the width of all proportional-width columns in the remaining space
if (PR_TRUE==gsDebug)
@@ -523,8 +525,12 @@ PRBool BasicTableLayoutStrategy::AssignPreliminaryColumnWidths()
// the current column (otherwise it would have already been deleted.)
if (spanInfo->initialColIndex <= colIndex)
{
if (0==spanInfo->effectiveMaxWidthOfSpannedCols)
if (-1==spanInfo->effectiveMaxWidthOfSpannedCols)
{ // if we have not yet computed effectiveMaxWidthOfSpannedCols, do it now
// first, initialize the sums
spanInfo->effectiveMaxWidthOfSpannedCols=0;
spanInfo->effectiveMinWidthOfSpannedCols=0;
// then compute the sums
for (PRInt32 span=0; span<spanInfo->initialColSpan; span++)
{
nsTableColFrame *nextColFrame = mTableFrame->GetColFrame(colIndex+span);
@@ -557,9 +563,9 @@ PRBool BasicTableLayoutStrategy::AssignPreliminaryColumnWidths()
}
else
{
spanCellMinWidth = spanInfo->cellMinWidth/spanInfo->initialColSpan;
if (colMinWidth < spanCellMinWidth)
{
spanCellMinWidth = spanInfo->cellMinWidth/spanInfo->initialColSpan;
colFrame->SetAdjustedMinColWidth(spanCellMinWidth);
}
}