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

bug 56024 - if there is no desired content width for a col, don't include the min content in totals. a=buster, r=attinasi.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@81100 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
karnaze%netscape.com 2000-10-13 01:57:02 +00:00
parent a042232339
commit 5c86c865cd
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp
View File

@ -1418,9 +1418,12 @@ void BasicTableLayoutStrategy::CalculateTotals(PRInt32& aCellSpacing,
// desired alone is lowest priority
aTotalCounts[DES_CON]++;
aTotalWidths[DES_CON] += colFrame->GetDesWidth();
aTotalAvailWidths[DES_CON] = aTotalWidths[DES_CON];
aMinWidths[DES_CON] += minCol;
nscoord desWidth = colFrame->GetDesWidth();
if (desWidth > 0) {
aTotalWidths[DES_CON] += desWidth;
aTotalAvailWidths[DES_CON] = aTotalWidths[DES_CON];
aMinWidths[DES_CON] += minCol;
}
}
// if it is not a degenerate table, add the last spacing on the right
if (numCols > 0) {

9
mozilla/layout/tables/BasicTableLayoutStrategy.cpp
View File

@ -1418,9 +1418,12 @@ void BasicTableLayoutStrategy::CalculateTotals(PRInt32& aCellSpacing,
// desired alone is lowest priority
aTotalCounts[DES_CON]++;
aTotalWidths[DES_CON] += colFrame->GetDesWidth();
aTotalAvailWidths[DES_CON] = aTotalWidths[DES_CON];
aMinWidths[DES_CON] += minCol;
nscoord desWidth = colFrame->GetDesWidth();
if (desWidth > 0) {
aTotalWidths[DES_CON] += desWidth;
aTotalAvailWidths[DES_CON] = aTotalWidths[DES_CON];
aMinWidths[DES_CON] += minCol;
}
}
// if it is not a degenerate table, add the last spacing on the right
if (numCols > 0) {