From 3d4aa5c47751d7cfcd2aae3f86935f654d57ab35 Mon Sep 17 00:00:00 2001 From: "karnaze%netscape.com" Date: Tue, 28 Sep 1999 21:57:44 +0000 Subject: [PATCH] bug 10009 - uses width set on in figuring width of nested table git-svn-id: svn://10.0.0.236/trunk@49247 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp | 2 +- mozilla/layout/tables/BasicTableLayoutStrategy.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp b/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp index 418703954ca..00bdce1e0b5 100644 --- a/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp +++ b/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp @@ -946,7 +946,7 @@ void BasicTableLayoutStrategy::SetMinAndMaxTableContentWidths() for (PRInt32 colX = 0; colX < mNumCols; colX++) { nsTableColFrame* colFrame = mTableFrame->GetColFrame(colX); mMinTableContentWidth += colFrame->GetMinWidth(); - mMaxTableContentWidth += colFrame->GetDesWidth(); + mMaxTableContentWidth += PR_MAX(colFrame->GetDesWidth(), colFrame->GetFixWidth()); if (mTableFrame->GetNumCellsOriginatingInCol(colX) > 0) { mMaxTableContentWidth += spacingX; mMinTableContentWidth += spacingX; diff --git a/mozilla/layout/tables/BasicTableLayoutStrategy.cpp b/mozilla/layout/tables/BasicTableLayoutStrategy.cpp index 418703954ca..00bdce1e0b5 100644 --- a/mozilla/layout/tables/BasicTableLayoutStrategy.cpp +++ b/mozilla/layout/tables/BasicTableLayoutStrategy.cpp @@ -946,7 +946,7 @@ void BasicTableLayoutStrategy::SetMinAndMaxTableContentWidths() for (PRInt32 colX = 0; colX < mNumCols; colX++) { nsTableColFrame* colFrame = mTableFrame->GetColFrame(colX); mMinTableContentWidth += colFrame->GetMinWidth(); - mMaxTableContentWidth += colFrame->GetDesWidth(); + mMaxTableContentWidth += PR_MAX(colFrame->GetDesWidth(), colFrame->GetFixWidth()); if (mTableFrame->GetNumCellsOriginatingInCol(colX) > 0) { mMaxTableContentWidth += spacingX; mMinTableContentWidth += spacingX;