From 371c47e0e39a7d8bc5d92bf7dad53df565a5c442 Mon Sep 17 00:00:00 2001 From: "karnaze%netscape.com" Date: Sun, 15 Apr 2001 20:49:09 +0000 Subject: [PATCH] bug 60807 - revised patch to handle 2 regression test cases. git-svn-id: svn://10.0.0.236/trunk@92358 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp | 7 ++++++- mozilla/layout/tables/BasicTableLayoutStrategy.cpp | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp b/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp index ba514217d9e..d9b5f9965d4 100644 --- a/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp +++ b/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp @@ -674,7 +674,12 @@ BasicTableLayoutStrategy::ComputeNonPctColspanWidths(PRInt32 aWidthInd } else { // FIX or DES_CON with LIMIT_NONE if (FIX == aWidthIndex) { - availWidth -= pctTotal; + if (autoDesTotal > 0) { + availWidth -= pctTotal + fixTotal; + } + else if (fixTotal > 0) { + availWidth -= pctTotal; + } } else if (DES_CON == aWidthIndex) { availWidth -= pctTotal + fixTotal; diff --git a/mozilla/layout/tables/BasicTableLayoutStrategy.cpp b/mozilla/layout/tables/BasicTableLayoutStrategy.cpp index ba514217d9e..d9b5f9965d4 100644 --- a/mozilla/layout/tables/BasicTableLayoutStrategy.cpp +++ b/mozilla/layout/tables/BasicTableLayoutStrategy.cpp @@ -674,7 +674,12 @@ BasicTableLayoutStrategy::ComputeNonPctColspanWidths(PRInt32 aWidthInd } else { // FIX or DES_CON with LIMIT_NONE if (FIX == aWidthIndex) { - availWidth -= pctTotal; + if (autoDesTotal > 0) { + availWidth -= pctTotal + fixTotal; + } + else if (fixTotal > 0) { + availWidth -= pctTotal; + } } else if (DES_CON == aWidthIndex) { availWidth -= pctTotal + fixTotal;