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

Incomplete workaround for bug #5453

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@30999 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kipp%netscape.com
1999-05-10 22:28:04 +00:00
parent df32a14b57
commit f372da0b11
2 changed files with 58 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
mozilla/layout/generic/nsBlockReflowContext.cpp
View File

@@ -344,21 +344,47 @@ nsBlockReflowContext::PlaceBlock(PRBool aForceFit,
nscoord x = mX;
nscoord y = mY;
if (0 == mMetrics.height) {
// For empty blocks we revert the y coordinate back so that the
// top margin is no longer applied.
y = mSpace.y;
if (IsHTMLParagraph(mFrame)) {
// Special "feature" for HTML compatability - empty paragraphs
// collapse into nothingness, including their margins.
*aBottomMarginResult = 0;
#ifdef NOISY_VERTICAL_MARGINS
printf(" ");
nsFrame::ListTag(stdout, mOuterReflowState.frame);
printf(": ");
nsFrame::ListTag(stdout, mFrame);
printf(" -- zapping top & bottom margin; y=%d spaceY=%d\n",
y, mSpace.y);
#endif
}
else {
// Collapse the bottom margin with the top margin that was already
// applied.
nscoord newBottomMargin = MaxMargin(collapsedBottomMargin, mTopMargin);
*aBottomMarginResult = newBottomMargin;
#ifdef NOISY_VERTICAL_MARGINS
printf(" ");
nsFrame::ListTag(stdout, mOuterReflowState.frame);
printf(": ");
nsFrame::ListTag(stdout, mFrame);
printf(" -- collapsing top & bottom margin together; y=%d spaceY=%d\n",
y, mSpace.y);
#endif
}
// For empty blocks we revert the y coordinate back so that the
// top margin is no longer applied.
nsIHTMLReflow* htmlReflow;
nsresult rv = mFrame->QueryInterface(kIHTMLReflowIID, (void**)&htmlReflow);
if (NS_SUCCEEDED(rv)) {
// XXX This isn't good enough. What if the floater was placed
// downward, just below another floater?
nscoord dy = mSpace.y - mY;
htmlReflow->MoveInSpaceManager(mPresContext,
mOuterReflowState.spaceManager, 0, dy);
}
y = mSpace.y;
// Empty blocks do not have anything special done to them and they
// always fit.
nsRect r(x, y, 0, 0);

32
mozilla/layout/html/base/src/nsBlockReflowContext.cpp
View File

@@ -344,21 +344,47 @@ nsBlockReflowContext::PlaceBlock(PRBool aForceFit,
nscoord x = mX;
nscoord y = mY;
if (0 == mMetrics.height) {
// For empty blocks we revert the y coordinate back so that the
// top margin is no longer applied.
y = mSpace.y;
if (IsHTMLParagraph(mFrame)) {
// Special "feature" for HTML compatability - empty paragraphs
// collapse into nothingness, including their margins.
*aBottomMarginResult = 0;
#ifdef NOISY_VERTICAL_MARGINS
printf(" ");
nsFrame::ListTag(stdout, mOuterReflowState.frame);
printf(": ");
nsFrame::ListTag(stdout, mFrame);
printf(" -- zapping top & bottom margin; y=%d spaceY=%d\n",
y, mSpace.y);
#endif
}
else {
// Collapse the bottom margin with the top margin that was already
// applied.
nscoord newBottomMargin = MaxMargin(collapsedBottomMargin, mTopMargin);
*aBottomMarginResult = newBottomMargin;
#ifdef NOISY_VERTICAL_MARGINS
printf(" ");
nsFrame::ListTag(stdout, mOuterReflowState.frame);
printf(": ");
nsFrame::ListTag(stdout, mFrame);
printf(" -- collapsing top & bottom margin together; y=%d spaceY=%d\n",
y, mSpace.y);
#endif
}
// For empty blocks we revert the y coordinate back so that the
// top margin is no longer applied.
nsIHTMLReflow* htmlReflow;
nsresult rv = mFrame->QueryInterface(kIHTMLReflowIID, (void**)&htmlReflow);
if (NS_SUCCEEDED(rv)) {
// XXX This isn't good enough. What if the floater was placed
// downward, just below another floater?
nscoord dy = mSpace.y - mY;
htmlReflow->MoveInSpaceManager(mPresContext,
mOuterReflowState.spaceManager, 0, dy);
}
y = mSpace.y;
// Empty blocks do not have anything special done to them and they
// always fit.
nsRect r(x, y, 0, 0);