bug 77982 - consider border/padding on a cell that goes from empty to non-empty during an incremental reflow. sr=attinasi, r=alexsavulov

This commit is contained in:
karnaze@netscape.com
2001-11-06 23:05:32 +00:00
parent d9043c1dbb
commit a7cf214107
4 changed files with 30 additions and 4 deletions

View File

@@ -785,6 +785,7 @@ CalcAvailWidth(nsTableFrame& aTableFrame,
PRInt32 colIndex;
aCellFrame.GetColIndex(colIndex);
PRInt32 colspan = aTableFrame.GetEffectiveColSpan(aCellFrame);
nscoord cellSpacing = 0;
for (PRInt32 spanX = 0; spanX < colspan; spanX++) {
nscoord colWidth = aTableFrame.GetColumnWidth(colIndex + spanX);
@@ -792,9 +793,12 @@ CalcAvailWidth(nsTableFrame& aTableFrame,
aColAvailWidth += colWidth;
}
if ((spanX > 0) && (aTableFrame.GetNumCellsOriginatingInCol(colIndex + spanX) > 0)) {
aColAvailWidth += aCellSpacingX;
cellSpacing += aCellSpacingX;
}
}
if (aColAvailWidth > 0) {
aColAvailWidth += cellSpacing;
}
aCellAvailWidth = aColAvailWidth;
// for a cell with a colspan > 1, use its fix width (if set) as the avail width