Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change to InitAbsoluteConstraints() to fix bug #5154

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@27976 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
troy%netscape.com
1999-04-17 04:24:12 +00:00
parent b47ff84d5d
commit cee63be2c8
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mozilla/layout/generic/nsHTMLReflowState.cpp
View File

@@ -556,6 +556,7 @@ nsHTMLReflowState::InitAbsoluteConstraints(nsIPresContext& aPresContext,
if ((eStyleUnit_Auto == mStyleSpacing->mMargin.GetLeftUnit()) ||
(eStyleUnit_Auto == mStyleSpacing->mMargin.GetRightUnit())) {
// Calculate the amount of space for margins
nscoord availMarginSpace = containingBlockWidth -
computedOffsets.left - mComputedBorderPadding.left -
computedWidth - mComputedBorderPadding.right -
@@ -568,10 +569,12 @@ nsHTMLReflowState::InitAbsoluteConstraints(nsIPresContext& aPresContext,
computedMargin.left = availMarginSpace / 2;
computedMargin.right = availMarginSpace - computedMargin.left;
} else {
computedMargin.left = availMarginSpace;
// Just 'margin-left' is 'auto'
computedMargin.left = availMarginSpace - computedMargin.right;
}
} else {
computedMargin.right = availMarginSpace;
// Just 'margin-right' is 'auto'
computedMargin.right = availMarginSpace - computedMargin.left;
}
}
}
@@ -670,6 +673,7 @@ nsHTMLReflowState::InitAbsoluteConstraints(nsIPresContext& aPresContext,
if ((eStyleUnit_Auto == mStyleSpacing->mMargin.GetTopUnit()) ||
(eStyleUnit_Auto == mStyleSpacing->mMargin.GetBottomUnit())) {
// Calculate the amount of space for margins
nscoord availMarginSpace = containingBlockHeight - computedOffsets.top -
mComputedBorderPadding.top - computedHeight - mComputedBorderPadding.bottom -
computedOffsets.bottom;
@@ -681,10 +685,12 @@ nsHTMLReflowState::InitAbsoluteConstraints(nsIPresContext& aPresContext,
computedMargin.top = availMarginSpace / 2;
computedMargin.bottom = availMarginSpace - computedMargin.top;
} else {
computedMargin.top = availMarginSpace;
// Just 'margin-top' is 'auto'
computedMargin.top = availMarginSpace - computedMargin.bottom;
}
} else {
computedMargin.bottom = availMarginSpace;
// Just 'margin-bottom' is 'auto'
computedMargin.bottom = availMarginSpace - computedMargin.top;
}
}
}

14
mozilla/layout/html/base/src/nsHTMLReflowState.cpp
View File

@@ -556,6 +556,7 @@ nsHTMLReflowState::InitAbsoluteConstraints(nsIPresContext& aPresContext,
if ((eStyleUnit_Auto == mStyleSpacing->mMargin.GetLeftUnit()) ||
(eStyleUnit_Auto == mStyleSpacing->mMargin.GetRightUnit())) {
// Calculate the amount of space for margins
nscoord availMarginSpace = containingBlockWidth -
computedOffsets.left - mComputedBorderPadding.left -
computedWidth - mComputedBorderPadding.right -
@@ -568,10 +569,12 @@ nsHTMLReflowState::InitAbsoluteConstraints(nsIPresContext& aPresContext,
computedMargin.left = availMarginSpace / 2;
computedMargin.right = availMarginSpace - computedMargin.left;
} else {
computedMargin.left = availMarginSpace;
// Just 'margin-left' is 'auto'
computedMargin.left = availMarginSpace - computedMargin.right;
}
} else {
computedMargin.right = availMarginSpace;
// Just 'margin-right' is 'auto'
computedMargin.right = availMarginSpace - computedMargin.left;
}
}
}
@@ -670,6 +673,7 @@ nsHTMLReflowState::InitAbsoluteConstraints(nsIPresContext& aPresContext,
if ((eStyleUnit_Auto == mStyleSpacing->mMargin.GetTopUnit()) ||
(eStyleUnit_Auto == mStyleSpacing->mMargin.GetBottomUnit())) {
// Calculate the amount of space for margins
nscoord availMarginSpace = containingBlockHeight - computedOffsets.top -
mComputedBorderPadding.top - computedHeight - mComputedBorderPadding.bottom -
computedOffsets.bottom;
@@ -681,10 +685,12 @@ nsHTMLReflowState::InitAbsoluteConstraints(nsIPresContext& aPresContext,
computedMargin.top = availMarginSpace / 2;
computedMargin.bottom = availMarginSpace - computedMargin.top;
} else {
computedMargin.top = availMarginSpace;
// Just 'margin-top' is 'auto'
computedMargin.top = availMarginSpace - computedMargin.bottom;
}
} else {
computedMargin.bottom = availMarginSpace;
// Just 'margin-bottom' is 'auto'
computedMargin.bottom = availMarginSpace - computedMargin.top;
}
}
}