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

Remove caret->Refresh calls. The presshell now refreshes the caret

Browse Source 
after painting.


git-svn-id: svn://10.0.0.236/trunk@25955 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
sfraser%netscape.com 1999-04-02 00:01:05 +00:00
parent 6bed169daa
commit d2d281780c
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mozilla/layout/generic/nsTextFrame.cpp
View File

@ -864,7 +864,7 @@ TextFrame::PaintUnicodeText(nsIPresContext& aPresContext,
aTextStyle, dx, dy, width);
// aRenderingContext.GetWidth(text, PRUint32(si.mStartOffset), textWidth);
shell->RefreshCaret();
//shell->RefreshCaret();
#ifdef SHOW_SELECTION_CURSOR
aRenderingContext.GetWidth(text, PRUint32(selectionOffset), textWidth);
@ -1343,7 +1343,7 @@ TextFrame::PaintTextSlowly(nsIPresContext& aPresContext,
RenderString(aRenderingContext, aStyleContext, aTextStyle,
text, textLength, dx, dy, width);
shell->RefreshCaret();
//shell->RefreshCaret();
#ifdef SHOW_SELECTION_CURSOR
@ -1495,7 +1495,7 @@ TextFrame::PaintAsciiText(nsIPresContext& aPresContext,
aTextStyle, dx, dy, width);
// aRenderingContext.GetWidth(text, PRUint32(si.mStartOffset), textWidth);
shell->RefreshCaret();
//shell->RefreshCaret();
#ifdef SHOW_SELECTION_CURSOR
aRenderingContext.GetWidth(text, PRUint32(selectionOffset), textWidth);
@ -1755,10 +1755,15 @@ TextFrame::SetSelected(nsSelectionStruct *aSelStruct)
trueEnd = aSelStruct->mStartFrame;
}
if (mSelectionOffset != trueBegin || mSelectionEnd != trueEnd) {
if (mSelectionOffset != trueBegin || mSelectionEnd != trueEnd)
{
PRBool wasCollapsed = (mSelectionOffset == mSelectionEnd);
mSelectionOffset = trueBegin;
mSelectionEnd = trueEnd;
aSelStruct->mForceRedraw = PR_TRUE;
// XXX when we no longer rely on the blue triangle to show the selection
// position (using the caret instead), then we can uncomment this to reduce
// redrawing. sfraser
aSelStruct->mForceRedraw = PR_TRUE; //!wasCollapsed || (trueBegin != trueEnd);
}
}
return nsFrame::SetSelected(aSelStruct);//this will do the actual

15
mozilla/layout/html/base/src/nsTextFrame.cpp
View File

@ -864,7 +864,7 @@ TextFrame::PaintUnicodeText(nsIPresContext& aPresContext,
aTextStyle, dx, dy, width);
// aRenderingContext.GetWidth(text, PRUint32(si.mStartOffset), textWidth);
shell->RefreshCaret();
//shell->RefreshCaret();
#ifdef SHOW_SELECTION_CURSOR
aRenderingContext.GetWidth(text, PRUint32(selectionOffset), textWidth);
@ -1343,7 +1343,7 @@ TextFrame::PaintTextSlowly(nsIPresContext& aPresContext,
RenderString(aRenderingContext, aStyleContext, aTextStyle,
text, textLength, dx, dy, width);
shell->RefreshCaret();
//shell->RefreshCaret();
#ifdef SHOW_SELECTION_CURSOR
@ -1495,7 +1495,7 @@ TextFrame::PaintAsciiText(nsIPresContext& aPresContext,
aTextStyle, dx, dy, width);
// aRenderingContext.GetWidth(text, PRUint32(si.mStartOffset), textWidth);
shell->RefreshCaret();
//shell->RefreshCaret();
#ifdef SHOW_SELECTION_CURSOR
aRenderingContext.GetWidth(text, PRUint32(selectionOffset), textWidth);
@ -1755,10 +1755,15 @@ TextFrame::SetSelected(nsSelectionStruct *aSelStruct)
trueEnd = aSelStruct->mStartFrame;
}
if (mSelectionOffset != trueBegin || mSelectionEnd != trueEnd) {
if (mSelectionOffset != trueBegin || mSelectionEnd != trueEnd)
{
PRBool wasCollapsed = (mSelectionOffset == mSelectionEnd);
mSelectionOffset = trueBegin;
mSelectionEnd = trueEnd;
aSelStruct->mForceRedraw = PR_TRUE;
// XXX when we no longer rely on the blue triangle to show the selection
// position (using the caret instead), then we can uncomment this to reduce
// redrawing. sfraser
aSelStruct->mForceRedraw = PR_TRUE; //!wasCollapsed || (trueBegin != trueEnd);
}
}
return nsFrame::SetSelected(aSelStruct);//this will do the actual