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

Fix for bug 159363: Text overlaps image (ESPN.com)

Browse Source 
- Place right floaters at the unconstrained right edge during an unconstrained reflow. This ensures that the floater will be repositioned when the constrained reflow comes around.

- Fixed |if| expression that was used to detect whether or not we were trying to do an unconstrained reflow.

r=karnaze@netscape.com  sr=dbaron@fas.harvard.edu


git-svn-id: svn://10.0.0.236/trunk@130144 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kin%netscape.com 2002-09-20 13:19:54 +00:00
parent 1c5756569f
commit b44ee3ebe9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/layout/generic/nsBlockReflowState.cpp
View File

@ -994,7 +994,7 @@ nsBlockReflowState::FlowAndPlaceFloater(nsFloaterCache* aFloaterCache,
}
else {
isLeftFloater = PR_FALSE;
if (NS_UNCONSTRAINEDSIZE != mAvailSpaceRect.XMost()) {
if (NS_UNCONSTRAINEDSIZE != mAvailSpaceRect.width) {
nsIFrame* prevInFlow;
floater->GetPrevInFlow(&prevInFlow);
if (prevInFlow) {
@ -1011,7 +1011,7 @@ nsBlockReflowState::FlowAndPlaceFloater(nsFloaterCache* aFloaterCache,
}
else {
okToAddRectRegion = PR_FALSE;
region.x = mAvailSpaceRect.x;
region.x = NS_UNCONSTRAINEDSIZE - region.width;
}
}
*aIsLeftFloater = isLeftFloater;

4
mozilla/layout/html/base/src/nsBlockReflowState.cpp
View File

@ -994,7 +994,7 @@ nsBlockReflowState::FlowAndPlaceFloater(nsFloaterCache* aFloaterCache,
}
else {
isLeftFloater = PR_FALSE;
if (NS_UNCONSTRAINEDSIZE != mAvailSpaceRect.XMost()) {
if (NS_UNCONSTRAINEDSIZE != mAvailSpaceRect.width) {
nsIFrame* prevInFlow;
floater->GetPrevInFlow(&prevInFlow);
if (prevInFlow) {
@ -1011,7 +1011,7 @@ nsBlockReflowState::FlowAndPlaceFloater(nsFloaterCache* aFloaterCache,
}
else {
okToAddRectRegion = PR_FALSE;
region.x = mAvailSpaceRect.x;
region.x = NS_UNCONSTRAINEDSIZE - region.width;
}
}
*aIsLeftFloater = isLeftFloater;