From aee2600aa3e0f50523713f6745bd5e353a6b8de6 Mon Sep 17 00:00:00 2001 From: "bernd.mielke%snafu.de" Date: Tue, 2 Jul 2002 04:39:16 +0000 Subject: [PATCH] bug 131687 Take into acount MIN_adj width as it has been included in totals before r=karnaze sr=waterson --- layout/html/table/src/BasicTableLayoutStrategy.cpp | 2 ++ layout/tables/BasicTableLayoutStrategy.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/layout/html/table/src/BasicTableLayoutStrategy.cpp b/layout/html/table/src/BasicTableLayoutStrategy.cpp index 38e208878e3d..631403b298ed 100644 --- a/layout/html/table/src/BasicTableLayoutStrategy.cpp +++ b/layout/html/table/src/BasicTableLayoutStrategy.cpp @@ -1859,6 +1859,8 @@ void BasicTableLayoutStrategy::AllocateConstrained(PRInt32 aAvailWidth, // proportional and desired widths are handled together PRBool haveProWidth = PR_FALSE; if (DES_CON == aWidthType) { + // Take into acount MIN_adj width as it has been included in totals before + maxWidth = PR_MAX(maxWidth, colFrame->GetWidth(MIN_ADJ)); nscoord proWidth = colFrame->GetWidth(MIN_PRO); if (proWidth >= 0) { haveProWidth = PR_TRUE; diff --git a/layout/tables/BasicTableLayoutStrategy.cpp b/layout/tables/BasicTableLayoutStrategy.cpp index 38e208878e3d..631403b298ed 100644 --- a/layout/tables/BasicTableLayoutStrategy.cpp +++ b/layout/tables/BasicTableLayoutStrategy.cpp @@ -1859,6 +1859,8 @@ void BasicTableLayoutStrategy::AllocateConstrained(PRInt32 aAvailWidth, // proportional and desired widths are handled together PRBool haveProWidth = PR_FALSE; if (DES_CON == aWidthType) { + // Take into acount MIN_adj width as it has been included in totals before + maxWidth = PR_MAX(maxWidth, colFrame->GetWidth(MIN_ADJ)); nscoord proWidth = colFrame->GetWidth(MIN_PRO); if (proWidth >= 0) { haveProWidth = PR_TRUE;