From 37153913f69f62e03dd0492ee15ba4cf0342c2c7 Mon Sep 17 00:00:00 2001 From: "buster%netscape.com" Date: Fri, 24 Jul 1998 03:53:59 +0000 Subject: [PATCH] fixed column balancing for case where minColWidth > specifiedFixedColumnWidth git-svn-id: svn://10.0.0.236/trunk@6361 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp | 3 +++ mozilla/layout/tables/BasicTableLayoutStrategy.cpp | 3 +++ 2 files changed, 6 insertions(+) diff --git a/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp b/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp index 18a0350cc34..4dfd6f66a4f 100644 --- a/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp +++ b/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp @@ -369,6 +369,9 @@ PRBool BasicTableLayoutStrategy::AssignPreliminaryColumnWidths() } } // end rowIndex for loop + // adjust the "fixed" width for content that is too wide + if (minColWidth>specifiedFixedColWidth) + specifiedFixedColWidth=minColWidth; // do all the global bookkeeping, factoring in margins nscoord colInset = mTableFrame->GetCellSpacing(); // keep a running total of the amount of space taken up by all fixed-width columns diff --git a/mozilla/layout/tables/BasicTableLayoutStrategy.cpp b/mozilla/layout/tables/BasicTableLayoutStrategy.cpp index 18a0350cc34..4dfd6f66a4f 100644 --- a/mozilla/layout/tables/BasicTableLayoutStrategy.cpp +++ b/mozilla/layout/tables/BasicTableLayoutStrategy.cpp @@ -369,6 +369,9 @@ PRBool BasicTableLayoutStrategy::AssignPreliminaryColumnWidths() } } // end rowIndex for loop + // adjust the "fixed" width for content that is too wide + if (minColWidth>specifiedFixedColWidth) + specifiedFixedColWidth=minColWidth; // do all the global bookkeeping, factoring in margins nscoord colInset = mTableFrame->GetCellSpacing(); // keep a running total of the amount of space taken up by all fixed-width columns