corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix table margins - remove redundancy in margin handling, bug 83786

Browse Source 
r=karnaze sr=attinasi a=dbaron
This commit is contained in:
bernd.mielke@snafu.de
2001-06-06 07:35:03 +00:00
parent 03b9e6941a
commit 44e75b83b7
4 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
layout/html/table/src/nsTableFrame.cpp
View File

@@ -3932,9 +3932,7 @@ nsTableFrame::CalcBorderBoxWidth(const nsHTMLReflowState& aState)
width = aState.availableWidth; width = aState.availableWidth;
} }
if (NS_UNCONSTRAINEDSIZE != aState.availableWidth) { if (NS_UNCONSTRAINEDSIZE != aState.availableWidth) {
nsMargin margin(0,0,0,0); width = aState.availableWidth;
aState.mStyleMargin->GetMargin(margin);
width = aState.availableWidth - margin.left - margin.right;
} }
} }
else if (width != NS_UNCONSTRAINEDSIZE) { else if (width != NS_UNCONSTRAINEDSIZE) {

2
layout/html/table/src/nsTableOuterFrame.cpp
View File

@@ -505,7 +505,7 @@ nsTableOuterFrame::GetChildAvailWidth(nsIPresContext* aPresContext,
GetMarginPadding(aPresContext, aOuterRS, aChildFrame, marginIgnore, aMarginNoAuto, aPadding); GetMarginPadding(aPresContext, aOuterRS, aChildFrame, marginIgnore, aMarginNoAuto, aPadding);
nscoord width = aOuterWidth; nscoord width = aOuterWidth;
if (NS_UNCONSTRAINEDSIZE != width) { if (NS_UNCONSTRAINEDSIZE != width) {
width = aOuterWidth - aMarginNoAuto.left + aMarginNoAuto.right; width = aOuterWidth - aMarginNoAuto.left - aMarginNoAuto.right;
width = PR_MAX(width, mMinCaptionWidth); width = PR_MAX(width, mMinCaptionWidth);
} }
return width; return width;

4
layout/tables/nsTableFrame.cpp
View File

@@ -3932,9 +3932,7 @@ nsTableFrame::CalcBorderBoxWidth(const nsHTMLReflowState& aState)
width = aState.availableWidth; width = aState.availableWidth;
} }
if (NS_UNCONSTRAINEDSIZE != aState.availableWidth) { if (NS_UNCONSTRAINEDSIZE != aState.availableWidth) {
nsMargin margin(0,0,0,0); width = aState.availableWidth;
aState.mStyleMargin->GetMargin(margin);
width = aState.availableWidth - margin.left - margin.right;
} }
} }
else if (width != NS_UNCONSTRAINEDSIZE) { else if (width != NS_UNCONSTRAINEDSIZE) {

2
layout/tables/nsTableOuterFrame.cpp
View File

@@ -505,7 +505,7 @@ nsTableOuterFrame::GetChildAvailWidth(nsIPresContext* aPresContext,
GetMarginPadding(aPresContext, aOuterRS, aChildFrame, marginIgnore, aMarginNoAuto, aPadding); GetMarginPadding(aPresContext, aOuterRS, aChildFrame, marginIgnore, aMarginNoAuto, aPadding);
nscoord width = aOuterWidth; nscoord width = aOuterWidth;
if (NS_UNCONSTRAINEDSIZE != width) { if (NS_UNCONSTRAINEDSIZE != width) {
width = aOuterWidth - aMarginNoAuto.left + aMarginNoAuto.right; width = aOuterWidth - aMarginNoAuto.left - aMarginNoAuto.right;
width = PR_MAX(width, mMinCaptionWidth); width = PR_MAX(width, mMinCaptionWidth);
} }
return width; return width;