From 8052df4516c2efe60babd874f1d5b6258cf68aa0 Mon Sep 17 00:00:00 2001 From: "bernd.mielke%snafu.de" Date: Wed, 6 Jun 2001 07:35:03 +0000 Subject: [PATCH] fix table margins - remove redundancy in margin handling, bug 83786 r=karnaze sr=attinasi a=dbaron --- layout/html/table/src/nsTableFrame.cpp | 4 +--- layout/html/table/src/nsTableOuterFrame.cpp | 2 +- layout/tables/nsTableFrame.cpp | 4 +--- layout/tables/nsTableOuterFrame.cpp | 2 +- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/layout/html/table/src/nsTableFrame.cpp b/layout/html/table/src/nsTableFrame.cpp index 4b71e79a5ae8..3e3d16ca9636 100644 --- a/layout/html/table/src/nsTableFrame.cpp +++ b/layout/html/table/src/nsTableFrame.cpp @@ -3932,9 +3932,7 @@ nsTableFrame::CalcBorderBoxWidth(const nsHTMLReflowState& aState) width = aState.availableWidth; } if (NS_UNCONSTRAINEDSIZE != aState.availableWidth) { - nsMargin margin(0,0,0,0); - aState.mStyleMargin->GetMargin(margin); - width = aState.availableWidth - margin.left - margin.right; + width = aState.availableWidth; } } else if (width != NS_UNCONSTRAINEDSIZE) { diff --git a/layout/html/table/src/nsTableOuterFrame.cpp b/layout/html/table/src/nsTableOuterFrame.cpp index 0768f62818dc..49d5fa85cf3e 100644 --- a/layout/html/table/src/nsTableOuterFrame.cpp +++ b/layout/html/table/src/nsTableOuterFrame.cpp @@ -505,7 +505,7 @@ nsTableOuterFrame::GetChildAvailWidth(nsIPresContext* aPresContext, GetMarginPadding(aPresContext, aOuterRS, aChildFrame, marginIgnore, aMarginNoAuto, aPadding); nscoord width = aOuterWidth; if (NS_UNCONSTRAINEDSIZE != width) { - width = aOuterWidth - aMarginNoAuto.left + aMarginNoAuto.right; + width = aOuterWidth - aMarginNoAuto.left - aMarginNoAuto.right; width = PR_MAX(width, mMinCaptionWidth); } return width; diff --git a/layout/tables/nsTableFrame.cpp b/layout/tables/nsTableFrame.cpp index 4b71e79a5ae8..3e3d16ca9636 100644 --- a/layout/tables/nsTableFrame.cpp +++ b/layout/tables/nsTableFrame.cpp @@ -3932,9 +3932,7 @@ nsTableFrame::CalcBorderBoxWidth(const nsHTMLReflowState& aState) width = aState.availableWidth; } if (NS_UNCONSTRAINEDSIZE != aState.availableWidth) { - nsMargin margin(0,0,0,0); - aState.mStyleMargin->GetMargin(margin); - width = aState.availableWidth - margin.left - margin.right; + width = aState.availableWidth; } } else if (width != NS_UNCONSTRAINEDSIZE) { diff --git a/layout/tables/nsTableOuterFrame.cpp b/layout/tables/nsTableOuterFrame.cpp index 0768f62818dc..49d5fa85cf3e 100644 --- a/layout/tables/nsTableOuterFrame.cpp +++ b/layout/tables/nsTableOuterFrame.cpp @@ -505,7 +505,7 @@ nsTableOuterFrame::GetChildAvailWidth(nsIPresContext* aPresContext, GetMarginPadding(aPresContext, aOuterRS, aChildFrame, marginIgnore, aMarginNoAuto, aPadding); nscoord width = aOuterWidth; if (NS_UNCONSTRAINEDSIZE != width) { - width = aOuterWidth - aMarginNoAuto.left + aMarginNoAuto.right; + width = aOuterWidth - aMarginNoAuto.left - aMarginNoAuto.right; width = PR_MAX(width, mMinCaptionWidth); } return width;