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

Checkin for AlexSavulov@netscape.com: fixes problem of block inside of a NOWRAP block causing incorrect sizing. b=93363, r=peterl sr=attinasi

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@100962 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
attinasi%netscape.com
2001-08-14 00:08:08 +00:00
parent 283ce36765
commit 01d2f5dc7e
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4118,7 +4118,17 @@ nsBlockFrame::PostPlaceLine(nsBlockReflowState& aState,
}
// Update xmost
nscoord xmost = aLine->mBounds.XMost();
nscoord xmost;
if(aLine->IsBlock() && aState.GetFlag(BRS_NOWRAP)) {
// since the nowrap blocks tend to be as wide as their widest element or
// sequel of elements that can't be wrapped anymore (see patch for bug 80817)
// let them set xmost to be the width of the widest element of the reflowed line
// (patches bug 93363 and other NOWRAP dups)
xmost = aMaxElementSize.width;
} else {
xmost = aLine->mBounds.XMost();
}
#ifdef DEBUG
if (CRAZY_WIDTH(xmost)) {
ListTag(stdout);

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

@@ -4118,7 +4118,17 @@ nsBlockFrame::PostPlaceLine(nsBlockReflowState& aState,
}
// Update xmost
nscoord xmost = aLine->mBounds.XMost();
nscoord xmost;
if(aLine->IsBlock() && aState.GetFlag(BRS_NOWRAP)) {
// since the nowrap blocks tend to be as wide as their widest element or
// sequel of elements that can't be wrapped anymore (see patch for bug 80817)
// let them set xmost to be the width of the widest element of the reflowed line
// (patches bug 93363 and other NOWRAP dups)
xmost = aMaxElementSize.width;
} else {
xmost = aLine->mBounds.XMost();
}
#ifdef DEBUG
if (CRAZY_WIDTH(xmost)) {
ListTag(stdout);