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

Fix for bug 78820 - right aligned floater in nowrap blocks are not

Browse Source 
positioned correctly. r= alexsavulov sr= kin


git-svn-id: svn://10.0.0.236/trunk@128299 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
alexsavulov%netscape.com 2002-08-27 22:31:24 +00:00
parent e79ece1418
commit aef6811a4b
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1948,12 +1948,14 @@ nsBlockFrame::PrepareResizeReflow(nsBlockReflowState& aState)
//
// For inline lines with no-wrap, the only way things
// could change is if there is a percentage-sized child.
// However, right floaters within such lines might need to be
// repositioned, so we check for floaters as well.
if (line->IsBlock() ||
line->HasPercentageChild() ||
line->HasFloaters() ||
(wrapping &&
((line != mLines.back() && !line->HasBreak()) ||
line->ResizeReflowOptimizationDisabled() ||
line->HasFloaters() ||
line->IsImpactedByFloater() ||
(line->mBounds.XMost() > newAvailWidth)))) {
line->MarkDirty();

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

@ -1948,12 +1948,14 @@ nsBlockFrame::PrepareResizeReflow(nsBlockReflowState& aState)
//
// For inline lines with no-wrap, the only way things
// could change is if there is a percentage-sized child.
// However, right floaters within such lines might need to be
// repositioned, so we check for floaters as well.
if (line->IsBlock() ||
line->HasPercentageChild() ||
line->HasFloaters() ||
(wrapping &&
((line != mLines.back() && !line->HasBreak()) ||
line->ResizeReflowOptimizationDisabled() ||
line->HasFloaters() ||
line->IsImpactedByFloater() ||
(line->mBounds.XMost() > newAvailWidth)))) {
line->MarkDirty();