Fixed margin collapsing bug

This commit is contained in:
kipp%netscape.com 1998-11-12 22:24:46 +00:00
parent 6524847ab5
commit ac0565a8f8
6 changed files with 6 additions and 6 deletions

View File

@ -3220,7 +3220,7 @@ nsBlockFrame::CalculateMargins(nsBlockReflowState& aState,
// Compute the collapsed top margin value (this is a generational
// margin collapse not a sibling margin collapse).
nscoord collapsedTopMargin =
nsInlineReflow::MaxMargin(childsCarriedOutBottomMargin, childsTopMargin);
nsInlineReflow::MaxMargin(childsCarriedOutTopMargin, childsTopMargin);
// Now perform sibling to sibling margin collapsing.
collapsedTopMargin = nsInlineReflow::MaxMargin(aState.mPrevBottomMargin,

View File

@ -3220,7 +3220,7 @@ nsBlockFrame::CalculateMargins(nsBlockReflowState& aState,
// Compute the collapsed top margin value (this is a generational
// margin collapse not a sibling margin collapse).
nscoord collapsedTopMargin =
nsInlineReflow::MaxMargin(childsCarriedOutBottomMargin, childsTopMargin);
nsInlineReflow::MaxMargin(childsCarriedOutTopMargin, childsTopMargin);
// Now perform sibling to sibling margin collapsing.
collapsedTopMargin = nsInlineReflow::MaxMargin(aState.mPrevBottomMargin,

View File

@ -3220,7 +3220,7 @@ nsBlockFrame::CalculateMargins(nsBlockReflowState& aState,
// Compute the collapsed top margin value (this is a generational
// margin collapse not a sibling margin collapse).
nscoord collapsedTopMargin =
nsInlineReflow::MaxMargin(childsCarriedOutBottomMargin, childsTopMargin);
nsInlineReflow::MaxMargin(childsCarriedOutTopMargin, childsTopMargin);
// Now perform sibling to sibling margin collapsing.
collapsedTopMargin = nsInlineReflow::MaxMargin(aState.mPrevBottomMargin,

View File

@ -3220,7 +3220,7 @@ nsBlockFrame::CalculateMargins(nsBlockReflowState& aState,
// Compute the collapsed top margin value (this is a generational
// margin collapse not a sibling margin collapse).
nscoord collapsedTopMargin =
nsInlineReflow::MaxMargin(childsCarriedOutBottomMargin, childsTopMargin);
nsInlineReflow::MaxMargin(childsCarriedOutTopMargin, childsTopMargin);
// Now perform sibling to sibling margin collapsing.
collapsedTopMargin = nsInlineReflow::MaxMargin(aState.mPrevBottomMargin,

View File

@ -3220,7 +3220,7 @@ nsBlockFrame::CalculateMargins(nsBlockReflowState& aState,
// Compute the collapsed top margin value (this is a generational
// margin collapse not a sibling margin collapse).
nscoord collapsedTopMargin =
nsInlineReflow::MaxMargin(childsCarriedOutBottomMargin, childsTopMargin);
nsInlineReflow::MaxMargin(childsCarriedOutTopMargin, childsTopMargin);
// Now perform sibling to sibling margin collapsing.
collapsedTopMargin = nsInlineReflow::MaxMargin(aState.mPrevBottomMargin,

View File

@ -3220,7 +3220,7 @@ nsBlockFrame::CalculateMargins(nsBlockReflowState& aState,
// Compute the collapsed top margin value (this is a generational
// margin collapse not a sibling margin collapse).
nscoord collapsedTopMargin =
nsInlineReflow::MaxMargin(childsCarriedOutBottomMargin, childsTopMargin);
nsInlineReflow::MaxMargin(childsCarriedOutTopMargin, childsTopMargin);
// Now perform sibling to sibling margin collapsing.
collapsedTopMargin = nsInlineReflow::MaxMargin(aState.mPrevBottomMargin,