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

bug 160014 - recalc cellspacing total when balancing. sr=kin, r=kmcclusk

Browse Source
This commit is contained in:
karnaze@netscape.com
2002-09-15 01:59:21 +00:00
parent f7c83e50b2
commit 3687f6875d
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
layout/html/table/src/BasicTableLayoutStrategy.cpp
View File

@@ -258,6 +258,10 @@ BasicTableLayoutStrategy::BalanceColumnWidths(nsIPresContext* aPresCont
maxWidth -= horOffset; maxWidth -= horOffset;
maxWidth = PR_MAX(0, maxWidth); maxWidth = PR_MAX(0, maxWidth);
// we will re-calc mCellSpacingTotal in case longer rows were added after Initialize was called
mCellSpacingTotal = 0;
nscoord spacingX = mTableFrame->GetCellSpacingX();
PRInt32 numNonZeroWidthCols = 0; PRInt32 numNonZeroWidthCols = 0;
// set the table's columns to the min width // set the table's columns to the min width
nscoord minTableWidth = 0; nscoord minTableWidth = 0;
@@ -272,6 +276,12 @@ BasicTableLayoutStrategy::BalanceColumnWidths(nsIPresContext* aPresCont
(colFrame->GetPctWidth() > 0) || (colFrame->GetWidth(MIN_PRO) > 0)) { (colFrame->GetPctWidth() > 0) || (colFrame->GetWidth(MIN_PRO) > 0)) {
numNonZeroWidthCols++; numNonZeroWidthCols++;
} }
if (mTableFrame->GetNumCellsOriginatingInCol(colX) > 0) {
mCellSpacingTotal += spacingX;
}
}
if (mCellSpacingTotal > 0) {
mCellSpacingTotal += spacingX; // add last cell spacing on right
} }
minTableWidth += mCellSpacingTotal; minTableWidth += mCellSpacingTotal;

10
layout/tables/BasicTableLayoutStrategy.cpp
View File

@@ -258,6 +258,10 @@ BasicTableLayoutStrategy::BalanceColumnWidths(nsIPresContext* aPresCont
maxWidth -= horOffset; maxWidth -= horOffset;
maxWidth = PR_MAX(0, maxWidth); maxWidth = PR_MAX(0, maxWidth);
// we will re-calc mCellSpacingTotal in case longer rows were added after Initialize was called
mCellSpacingTotal = 0;
nscoord spacingX = mTableFrame->GetCellSpacingX();
PRInt32 numNonZeroWidthCols = 0; PRInt32 numNonZeroWidthCols = 0;
// set the table's columns to the min width // set the table's columns to the min width
nscoord minTableWidth = 0; nscoord minTableWidth = 0;
@@ -272,6 +276,12 @@ BasicTableLayoutStrategy::BalanceColumnWidths(nsIPresContext* aPresCont
(colFrame->GetPctWidth() > 0) || (colFrame->GetWidth(MIN_PRO) > 0)) { (colFrame->GetPctWidth() > 0) || (colFrame->GetWidth(MIN_PRO) > 0)) {
numNonZeroWidthCols++; numNonZeroWidthCols++;
} }
if (mTableFrame->GetNumCellsOriginatingInCol(colX) > 0) {
mCellSpacingTotal += spacingX;
}
}
if (mCellSpacingTotal > 0) {
mCellSpacingTotal += spacingX; // add last cell spacing on right
} }
minTableWidth += mCellSpacingTotal; minTableWidth += mCellSpacingTotal;