From 38f87f8a57ddf46b7575fb9de38a591266aa52cc 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 git-svn-id: svn://10.0.0.236/trunk@124473 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp | 2 ++ mozilla/layout/tables/BasicTableLayoutStrategy.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp b/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp index 38e208878e3..631403b298e 100644 --- a/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp +++ b/mozilla/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/mozilla/layout/tables/BasicTableLayoutStrategy.cpp b/mozilla/layout/tables/BasicTableLayoutStrategy.cpp index 38e208878e3..631403b298e 100644 --- a/mozilla/layout/tables/BasicTableLayoutStrategy.cpp +++ b/mozilla/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;