From 560cdbe972756d513aed1e7a6d7e59ffddb53f2d Mon Sep 17 00:00:00 2001 From: "bmlk@gmx.de" Date: Sat, 31 May 2003 14:15:56 +0000 Subject: [PATCH] avoid marking columns that only have a desired width empty, what would exclude them from space redistribution, bug 194024, r=jkeiser sr=bzbarsky --- layout/html/table/src/BasicTableLayoutStrategy.cpp | 5 +++-- layout/tables/BasicTableLayoutStrategy.cpp | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/layout/html/table/src/BasicTableLayoutStrategy.cpp b/layout/html/table/src/BasicTableLayoutStrategy.cpp index db10464beca1..b9543f33b276 100644 --- a/layout/html/table/src/BasicTableLayoutStrategy.cpp +++ b/layout/html/table/src/BasicTableLayoutStrategy.cpp @@ -270,8 +270,9 @@ BasicTableLayoutStrategy::BalanceColumnWidths(nsIPresContext* aPresCont nscoord colMinWidth = colFrame->GetMinWidth(); mTableFrame->SetColumnWidth(colX, colMinWidth); minTableWidth += colMinWidth; - if ((colFrame->GetMinWidth() > 0) || (colFrame->GetFixWidth() > 0) || - (colFrame->GetPctWidth() > 0) || (colFrame->GetWidth(MIN_PRO) > 0)) { + if ((colFrame->GetMinWidth() > 0) || (colFrame->GetDesWidth() > 0) || + (colFrame->GetFixWidth() > 0) || (colFrame->GetPctWidth() > 0) || + (colFrame->GetWidth(MIN_PRO) > 0)) { numNonZeroWidthCols++; } if (mTableFrame->GetNumCellsOriginatingInCol(colX) > 0) { diff --git a/layout/tables/BasicTableLayoutStrategy.cpp b/layout/tables/BasicTableLayoutStrategy.cpp index db10464beca1..b9543f33b276 100644 --- a/layout/tables/BasicTableLayoutStrategy.cpp +++ b/layout/tables/BasicTableLayoutStrategy.cpp @@ -270,8 +270,9 @@ BasicTableLayoutStrategy::BalanceColumnWidths(nsIPresContext* aPresCont nscoord colMinWidth = colFrame->GetMinWidth(); mTableFrame->SetColumnWidth(colX, colMinWidth); minTableWidth += colMinWidth; - if ((colFrame->GetMinWidth() > 0) || (colFrame->GetFixWidth() > 0) || - (colFrame->GetPctWidth() > 0) || (colFrame->GetWidth(MIN_PRO) > 0)) { + if ((colFrame->GetMinWidth() > 0) || (colFrame->GetDesWidth() > 0) || + (colFrame->GetFixWidth() > 0) || (colFrame->GetPctWidth() > 0) || + (colFrame->GetWidth(MIN_PRO) > 0)) { numNonZeroWidthCols++; } if (mTableFrame->GetNumCellsOriginatingInCol(colX) > 0) {