From 378581e3b299fe484cec7ea5246577f1cf4463c3 Mon Sep 17 00:00:00 2001 From: "buster%netscape.com" Date: Thu, 29 Oct 1998 19:42:43 +0000 Subject: [PATCH] minor fix in determining which layout algorithm to call based on available size git-svn-id: svn://10.0.0.236/trunk@13661 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp | 3 ++- mozilla/layout/tables/BasicTableLayoutStrategy.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp b/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp index 74fe648d982..6c73402bc74 100644 --- a/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp +++ b/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp @@ -459,6 +459,7 @@ PRBool BasicTableLayoutStrategy::AssignPreliminaryColumnWidths() mFixedTableWidth += specifiedFixedColWidth + colInset; if (0==colIndex) mFixedTableWidth += colInset; + if (PR_TRUE==gsDebug) printf("setting mFixedTableWidth=%d\n", mFixedTableWidth); } // cache the computed column info @@ -838,7 +839,7 @@ PRBool BasicTableLayoutStrategy::BalanceProportionalColumns(const nsHTMLReflowSt if (gsDebug) printf (" * auto table minTW does not fit, calling BalanceColumnsTableDoesNotFit\n"); result = BalanceColumnsTableDoesNotFit(); } - else if (mMaxTableWidth <= actualMaxWidth) + else if (mMaxTableWidth < actualMaxWidth) { // the max width of the table fits comfortably in the available space if (gsDebug) printf (" * auto table desired size fits, calling BalanceColumnsTableFits\n"); result = BalanceColumnsTableFits(aReflowState, aAvailWidth, diff --git a/mozilla/layout/tables/BasicTableLayoutStrategy.cpp b/mozilla/layout/tables/BasicTableLayoutStrategy.cpp index 74fe648d982..6c73402bc74 100644 --- a/mozilla/layout/tables/BasicTableLayoutStrategy.cpp +++ b/mozilla/layout/tables/BasicTableLayoutStrategy.cpp @@ -459,6 +459,7 @@ PRBool BasicTableLayoutStrategy::AssignPreliminaryColumnWidths() mFixedTableWidth += specifiedFixedColWidth + colInset; if (0==colIndex) mFixedTableWidth += colInset; + if (PR_TRUE==gsDebug) printf("setting mFixedTableWidth=%d\n", mFixedTableWidth); } // cache the computed column info @@ -838,7 +839,7 @@ PRBool BasicTableLayoutStrategy::BalanceProportionalColumns(const nsHTMLReflowSt if (gsDebug) printf (" * auto table minTW does not fit, calling BalanceColumnsTableDoesNotFit\n"); result = BalanceColumnsTableDoesNotFit(); } - else if (mMaxTableWidth <= actualMaxWidth) + else if (mMaxTableWidth < actualMaxWidth) { // the max width of the table fits comfortably in the available space if (gsDebug) printf (" * auto table desired size fits, calling BalanceColumnsTableFits\n"); result = BalanceColumnsTableFits(aReflowState, aAvailWidth,