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

bug 14818 - made standard mode like NavQuirks when handling colspans exceeding the number of columns.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@49801 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
karnaze%netscape.com
1999-10-05 04:21:00 +00:00
parent b4b00ba592
commit aa9be56cfa
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mozilla/layout/html/table/src/nsTableCellFrame.cpp
View File

@@ -673,18 +673,18 @@ NS_METHOD nsTableCellFrame::Reflow(nsIPresContext& aPresContext,
if (border.right > 0)
smallestMinWidth += onePixel;
}
PRInt32 colspan = GetColSpan();
if (colspan > 1) {
smallestMinWidth = PR_MAX(smallestMinWidth, colspan * onePixel);
nscoord spacingX = tableFrame->GetCellSpacingX();
nscoord spacingExtra = spacingX * (colspan - 1);
smallestMinWidth += spacingExtra;
if (padding.left > 0) {
smallestMinWidth -= onePixel;
}
}
PRInt32 colspan = GetColSpan();
if (colspan > 1) {
smallestMinWidth = PR_MAX(smallestMinWidth, colspan * onePixel);
nscoord spacingX = tableFrame->GetCellSpacingX();
nscoord spacingExtra = spacingX * (colspan - 1);
smallestMinWidth += spacingExtra;
if (padding.left > 0) {
smallestMinWidth -= onePixel;
}
}
if ((0 == kidSize.width) && (NS_UNCONSTRAINEDSIZE != kidReflowState.availableWidth)) {
// empty content has to be forced to the assigned width for resize or incremental reflow
kidSize.width = kidReflowState.availableWidth;

20
mozilla/layout/tables/nsTableCellFrame.cpp
View File

@@ -673,18 +673,18 @@ NS_METHOD nsTableCellFrame::Reflow(nsIPresContext& aPresContext,
if (border.right > 0)
smallestMinWidth += onePixel;
}
PRInt32 colspan = GetColSpan();
if (colspan > 1) {
smallestMinWidth = PR_MAX(smallestMinWidth, colspan * onePixel);
nscoord spacingX = tableFrame->GetCellSpacingX();
nscoord spacingExtra = spacingX * (colspan - 1);
smallestMinWidth += spacingExtra;
if (padding.left > 0) {
smallestMinWidth -= onePixel;
}
}
PRInt32 colspan = GetColSpan();
if (colspan > 1) {
smallestMinWidth = PR_MAX(smallestMinWidth, colspan * onePixel);
nscoord spacingX = tableFrame->GetCellSpacingX();
nscoord spacingExtra = spacingX * (colspan - 1);
smallestMinWidth += spacingExtra;
if (padding.left > 0) {
smallestMinWidth -= onePixel;
}
}
if ((0 == kidSize.width) && (NS_UNCONSTRAINEDSIZE != kidReflowState.availableWidth)) {
// empty content has to be forced to the assigned width for resize or incremental reflow
kidSize.width = kidReflowState.availableWidth;