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

Compute correct Y coordinate after clear floaters; fixed bullet positioning bug when placing a bullet next to a block frame that has a carried-out top margin

Browse Source
This commit is contained in:
kipp@netscape.com
1998-12-11 22:26:45 +00:00
parent dea9635d9d
commit 2eb034d1f1
6 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
layout/generic/nsBlockFrame.cpp
View File

@@ -2291,7 +2291,8 @@ nsBaseIBFrame::ReflowBlockFrame(nsBlockReflowState& aState,
PostPlaceLine(aState, aLine, brc.GetMaxElementSize()); PostPlaceLine(aState, aLine, brc.GetMaxElementSize());
// Notify anyone who cares that the line has been placed // Notify anyone who cares that the line has been placed
DidPlaceLine(aState, aLine, brc.GetCollapsedTopMargin(), DidPlaceLine(aState, aLine,
applyTopMargin ? brc.GetCollapsedTopMargin() : 0,
brc.GetCollapsedBottomMargin(), aKeepReflowGoing); brc.GetCollapsedBottomMargin(), aKeepReflowGoing);
} }
else { else {
@@ -3675,7 +3676,7 @@ nsBlockReflowState::ClearFloaters(nscoord aY, PRUint8 aBreakType)
nscoord newY = mCurrentBand.ClearFloaters(aY - mBorderPadding.top, nscoord newY = mCurrentBand.ClearFloaters(aY - mBorderPadding.top,
aBreakType); aBreakType);
mY = newY; mY = newY + mBorderPadding.top;
GetAvailableSpace(); GetAvailableSpace();
#ifdef NOISY_INCREMENTAL_REFLOW #ifdef NOISY_INCREMENTAL_REFLOW

5
layout/generic/nsBlockReflowState.cpp
View File

@@ -2291,7 +2291,8 @@ nsBaseIBFrame::ReflowBlockFrame(nsBlockReflowState& aState,
PostPlaceLine(aState, aLine, brc.GetMaxElementSize()); PostPlaceLine(aState, aLine, brc.GetMaxElementSize());
// Notify anyone who cares that the line has been placed // Notify anyone who cares that the line has been placed
DidPlaceLine(aState, aLine, brc.GetCollapsedTopMargin(), DidPlaceLine(aState, aLine,
applyTopMargin ? brc.GetCollapsedTopMargin() : 0,
brc.GetCollapsedBottomMargin(), aKeepReflowGoing); brc.GetCollapsedBottomMargin(), aKeepReflowGoing);
} }
else { else {
@@ -3675,7 +3676,7 @@ nsBlockReflowState::ClearFloaters(nscoord aY, PRUint8 aBreakType)
nscoord newY = mCurrentBand.ClearFloaters(aY - mBorderPadding.top, nscoord newY = mCurrentBand.ClearFloaters(aY - mBorderPadding.top,
aBreakType); aBreakType);
mY = newY; mY = newY + mBorderPadding.top;
GetAvailableSpace(); GetAvailableSpace();
#ifdef NOISY_INCREMENTAL_REFLOW #ifdef NOISY_INCREMENTAL_REFLOW

5
layout/generic/nsBlockReflowState.h
View File

@@ -2291,7 +2291,8 @@ nsBaseIBFrame::ReflowBlockFrame(nsBlockReflowState& aState,
PostPlaceLine(aState, aLine, brc.GetMaxElementSize()); PostPlaceLine(aState, aLine, brc.GetMaxElementSize());
// Notify anyone who cares that the line has been placed // Notify anyone who cares that the line has been placed
DidPlaceLine(aState, aLine, brc.GetCollapsedTopMargin(), DidPlaceLine(aState, aLine,
applyTopMargin ? brc.GetCollapsedTopMargin() : 0,
brc.GetCollapsedBottomMargin(), aKeepReflowGoing); brc.GetCollapsedBottomMargin(), aKeepReflowGoing);
} }
else { else {
@@ -3675,7 +3676,7 @@ nsBlockReflowState::ClearFloaters(nscoord aY, PRUint8 aBreakType)
nscoord newY = mCurrentBand.ClearFloaters(aY - mBorderPadding.top, nscoord newY = mCurrentBand.ClearFloaters(aY - mBorderPadding.top,
aBreakType); aBreakType);
mY = newY; mY = newY + mBorderPadding.top;
GetAvailableSpace(); GetAvailableSpace();
#ifdef NOISY_INCREMENTAL_REFLOW #ifdef NOISY_INCREMENTAL_REFLOW

5
layout/html/base/src/nsBlockFrame.cpp
View File

@@ -2291,7 +2291,8 @@ nsBaseIBFrame::ReflowBlockFrame(nsBlockReflowState& aState,
PostPlaceLine(aState, aLine, brc.GetMaxElementSize()); PostPlaceLine(aState, aLine, brc.GetMaxElementSize());
// Notify anyone who cares that the line has been placed // Notify anyone who cares that the line has been placed
DidPlaceLine(aState, aLine, brc.GetCollapsedTopMargin(), DidPlaceLine(aState, aLine,
applyTopMargin ? brc.GetCollapsedTopMargin() : 0,
brc.GetCollapsedBottomMargin(), aKeepReflowGoing); brc.GetCollapsedBottomMargin(), aKeepReflowGoing);
} }
else { else {
@@ -3675,7 +3676,7 @@ nsBlockReflowState::ClearFloaters(nscoord aY, PRUint8 aBreakType)
nscoord newY = mCurrentBand.ClearFloaters(aY - mBorderPadding.top, nscoord newY = mCurrentBand.ClearFloaters(aY - mBorderPadding.top,
aBreakType); aBreakType);
mY = newY; mY = newY + mBorderPadding.top;
GetAvailableSpace(); GetAvailableSpace();
#ifdef NOISY_INCREMENTAL_REFLOW #ifdef NOISY_INCREMENTAL_REFLOW

5
layout/html/base/src/nsBlockReflowState.cpp
View File

@@ -2291,7 +2291,8 @@ nsBaseIBFrame::ReflowBlockFrame(nsBlockReflowState& aState,
PostPlaceLine(aState, aLine, brc.GetMaxElementSize()); PostPlaceLine(aState, aLine, brc.GetMaxElementSize());
// Notify anyone who cares that the line has been placed // Notify anyone who cares that the line has been placed
DidPlaceLine(aState, aLine, brc.GetCollapsedTopMargin(), DidPlaceLine(aState, aLine,
applyTopMargin ? brc.GetCollapsedTopMargin() : 0,
brc.GetCollapsedBottomMargin(), aKeepReflowGoing); brc.GetCollapsedBottomMargin(), aKeepReflowGoing);
} }
else { else {
@@ -3675,7 +3676,7 @@ nsBlockReflowState::ClearFloaters(nscoord aY, PRUint8 aBreakType)
nscoord newY = mCurrentBand.ClearFloaters(aY - mBorderPadding.top, nscoord newY = mCurrentBand.ClearFloaters(aY - mBorderPadding.top,
aBreakType); aBreakType);
mY = newY; mY = newY + mBorderPadding.top;
GetAvailableSpace(); GetAvailableSpace();
#ifdef NOISY_INCREMENTAL_REFLOW #ifdef NOISY_INCREMENTAL_REFLOW

5
layout/html/base/src/nsBlockReflowState.h
View File

@@ -2291,7 +2291,8 @@ nsBaseIBFrame::ReflowBlockFrame(nsBlockReflowState& aState,
PostPlaceLine(aState, aLine, brc.GetMaxElementSize()); PostPlaceLine(aState, aLine, brc.GetMaxElementSize());
// Notify anyone who cares that the line has been placed // Notify anyone who cares that the line has been placed
DidPlaceLine(aState, aLine, brc.GetCollapsedTopMargin(), DidPlaceLine(aState, aLine,
applyTopMargin ? brc.GetCollapsedTopMargin() : 0,
brc.GetCollapsedBottomMargin(), aKeepReflowGoing); brc.GetCollapsedBottomMargin(), aKeepReflowGoing);
} }
else { else {
@@ -3675,7 +3676,7 @@ nsBlockReflowState::ClearFloaters(nscoord aY, PRUint8 aBreakType)
nscoord newY = mCurrentBand.ClearFloaters(aY - mBorderPadding.top, nscoord newY = mCurrentBand.ClearFloaters(aY - mBorderPadding.top,
aBreakType); aBreakType);
mY = newY; mY = newY + mBorderPadding.top;
GetAvailableSpace(); GetAvailableSpace();
#ifdef NOISY_INCREMENTAL_REFLOW #ifdef NOISY_INCREMENTAL_REFLOW