From 6d3930718fa106492bb2800c1cefdb1d3d32bf97 Mon Sep 17 00:00:00 2001 From: "karnaze%netscape.com" Date: Thu, 30 Nov 2000 21:44:59 +0000 Subject: [PATCH] bug 42033 (patch submitted by bernd.mielke@snafu.de) - give 0 proportional cols their min width. sr=waterson, r=karnaze. git-svn-id: svn://10.0.0.236/trunk@83147 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp | 4 +++- mozilla/layout/tables/BasicTableLayoutStrategy.cpp | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp b/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp index 0875430ef6e..918eba0d5a9 100644 --- a/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp +++ b/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp @@ -408,7 +408,9 @@ void BasicTableLayoutStrategy::AllocateUnconstrained(PRInt32 aAllocAmount, PRInt32 colX; PRInt32 numCols = mTableFrame->GetColCount(); for (colX = 0; colX < numCols; colX++) { - if (-1 != aAllocTypes[colX]) { + nsTableColFrame* colFrame = mTableFrame->GetColFrame(colX); + PRBool skipColumn = aSkip0Proportional && (e0ProportionConstraint == colFrame->GetConstraint()); + if (-1 != aAllocTypes[colX] && !skipColumn ) { divisor += mTableFrame->GetColumnWidth(colX); numColsAllocated++; } diff --git a/mozilla/layout/tables/BasicTableLayoutStrategy.cpp b/mozilla/layout/tables/BasicTableLayoutStrategy.cpp index 0875430ef6e..918eba0d5a9 100644 --- a/mozilla/layout/tables/BasicTableLayoutStrategy.cpp +++ b/mozilla/layout/tables/BasicTableLayoutStrategy.cpp @@ -408,7 +408,9 @@ void BasicTableLayoutStrategy::AllocateUnconstrained(PRInt32 aAllocAmount, PRInt32 colX; PRInt32 numCols = mTableFrame->GetColCount(); for (colX = 0; colX < numCols; colX++) { - if (-1 != aAllocTypes[colX]) { + nsTableColFrame* colFrame = mTableFrame->GetColFrame(colX); + PRBool skipColumn = aSkip0Proportional && (e0ProportionConstraint == colFrame->GetConstraint()); + if (-1 != aAllocTypes[colX] && !skipColumn ) { divisor += mTableFrame->GetColumnWidth(colX); numColsAllocated++; }