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

Fix for bug 138573 (hitting return in list item causes list problems; workaround is to refresh)

Browse Source 
Modified SlideLine() to use the combined area instead of the linebox
  bounds when invalidating. This makes sure that we invalidate the
  area occupied by the list bullets/ordinals.

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


git-svn-id: svn://10.0.0.236/trunk@122594 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kin%netscape.com
2002-06-03 21:35:54 +00:00
parent 07868fbe83
commit 79aa82cbf1
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2780,13 +2780,18 @@ nsBlockFrame::SlideLine(nsBlockReflowState& aState,
{
NS_PRECONDITION(aDY != 0, "why slide a line nowhere?");
PRBool doInvalidate = !aLine->mBounds.IsEmpty();
nsRect lineCombinedArea;
aLine->GetCombinedArea(&lineCombinedArea);
PRBool doInvalidate = !lineCombinedArea.IsEmpty();
if (doInvalidate)
Invalidate(aState.mPresContext, aLine->mBounds);
Invalidate(aState.mPresContext, lineCombinedArea);
// Adjust line state
aLine->SlideBy(aDY);
if (doInvalidate)
Invalidate(aState.mPresContext, aLine->mBounds);
if (doInvalidate) {
aLine->GetCombinedArea(&lineCombinedArea);
Invalidate(aState.mPresContext, lineCombinedArea);
}
// Adjust the frames in the line
nsIFrame* kid = aLine->mFirstChild;

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

@@ -2780,13 +2780,18 @@ nsBlockFrame::SlideLine(nsBlockReflowState& aState,
{
NS_PRECONDITION(aDY != 0, "why slide a line nowhere?");
PRBool doInvalidate = !aLine->mBounds.IsEmpty();
nsRect lineCombinedArea;
aLine->GetCombinedArea(&lineCombinedArea);
PRBool doInvalidate = !lineCombinedArea.IsEmpty();
if (doInvalidate)
Invalidate(aState.mPresContext, aLine->mBounds);
Invalidate(aState.mPresContext, lineCombinedArea);
// Adjust line state
aLine->SlideBy(aDY);
if (doInvalidate)
Invalidate(aState.mPresContext, aLine->mBounds);
if (doInvalidate) {
aLine->GetCombinedArea(&lineCombinedArea);
Invalidate(aState.mPresContext, lineCombinedArea);
}
// Adjust the frames in the line
nsIFrame* kid = aLine->mFirstChild;