From 05fac045c19b5dafb11683a4e3957923890dc4a5 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 git-svn-id: svn://10.0.0.236/trunk@143140 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp | 5 +++-- mozilla/layout/tables/BasicTableLayoutStrategy.cpp | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp b/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp index db10464beca..b9543f33b27 100644 --- a/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp +++ b/mozilla/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/mozilla/layout/tables/BasicTableLayoutStrategy.cpp b/mozilla/layout/tables/BasicTableLayoutStrategy.cpp index db10464beca..b9543f33b27 100644 --- a/mozilla/layout/tables/BasicTableLayoutStrategy.cpp +++ b/mozilla/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) {