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

Getting rid of all the printfs and complaints that fire in mailnews by making

Browse Source 
the fixed table layout algorithm smarter about unconstrained width reflow.
This commit is contained in:
hyatt@netscape.com
1999-07-23 23:41:05 +00:00
parent ac83f36070
commit aab60da5b4
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
layout/html/table/src/FixedTableLayoutStrategy.cpp
View File

@@ -108,7 +108,7 @@ PRBool FixedTableLayoutStrategy::AssignPreliminaryColumnWidths(nscoord aComputed
nscoord* colWidths = new PRBool[mNumCols]; nscoord* colWidths = new PRBool[mNumCols];
nsCRT::memset(colWidths, -1, mNumCols*sizeof(nscoord)); nsCRT::memset(colWidths, -1, mNumCols*sizeof(nscoord));
// for every column, determine it's specified width // for every column, determine its specified width
for (colX = 0; colX < mNumCols; colX++) { for (colX = 0; colX < mNumCols; colX++) {
// Get column information // Get column information
nsTableColFrame* colFrame = mTableFrame->GetColFrame(colX); nsTableColFrame* colFrame = mTableFrame->GetColFrame(colX);
@@ -157,6 +157,11 @@ PRBool FixedTableLayoutStrategy::AssignPreliminaryColumnWidths(nscoord aComputed
nscoord lastColAllocated = -1; nscoord lastColAllocated = -1;
nscoord remainingWidth = availWidth - totalColWidth; nscoord remainingWidth = availWidth - totalColWidth;
if (CRAZY_WIDTH(remainingWidth)) {
// let's put a cap on the width so that it doesn't become insane.
remainingWidth = 100;
}
if (tableIsFixedWidth && (0 < remainingWidth)) { if (tableIsFixedWidth && (0 < remainingWidth)) {
if (mNumCols > specifiedCols) { if (mNumCols > specifiedCols) {
// allocate the extra space to the columns which have no width specified // allocate the extra space to the columns which have no width specified

7
layout/tables/FixedTableLayoutStrategy.cpp
View File

@@ -108,7 +108,7 @@ PRBool FixedTableLayoutStrategy::AssignPreliminaryColumnWidths(nscoord aComputed
nscoord* colWidths = new PRBool[mNumCols]; nscoord* colWidths = new PRBool[mNumCols];
nsCRT::memset(colWidths, -1, mNumCols*sizeof(nscoord)); nsCRT::memset(colWidths, -1, mNumCols*sizeof(nscoord));
// for every column, determine it's specified width // for every column, determine its specified width
for (colX = 0; colX < mNumCols; colX++) { for (colX = 0; colX < mNumCols; colX++) {
// Get column information // Get column information
nsTableColFrame* colFrame = mTableFrame->GetColFrame(colX); nsTableColFrame* colFrame = mTableFrame->GetColFrame(colX);
@@ -157,6 +157,11 @@ PRBool FixedTableLayoutStrategy::AssignPreliminaryColumnWidths(nscoord aComputed
nscoord lastColAllocated = -1; nscoord lastColAllocated = -1;
nscoord remainingWidth = availWidth - totalColWidth; nscoord remainingWidth = availWidth - totalColWidth;
if (CRAZY_WIDTH(remainingWidth)) {
// let's put a cap on the width so that it doesn't become insane.
remainingWidth = 100;
}
if (tableIsFixedWidth && (0 < remainingWidth)) { if (tableIsFixedWidth && (0 < remainingWidth)) {
if (mNumCols > specifiedCols) { if (mNumCols > specifiedCols) {
// allocate the extra space to the columns which have no width specified // allocate the extra space to the columns which have no width specified