corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adding same code to paintAscii as i did to paintUnicode

Browse Source
This commit is contained in:
mjudge@netscape.com
1999-01-25 01:53:40 +00:00
parent d9346800ef
commit 0dc1ad5d27
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
layout/generic/nsTextFrame.cpp
View File

@@ -827,6 +827,8 @@ TextFrame::PaintUnicodeText(nsIPresContext& aPresContext,
} }
if (selectionEnd > textLength) if (selectionEnd > textLength)
selectionEnd = textLength; selectionEnd = textLength;
if (selectionOffset > textLength)
selectionOffset = textLength;
if (selectionOffset == selectionEnd){ if (selectionOffset == selectionEnd){
aRenderingContext.DrawString(text, textLength, dx, dy, width); aRenderingContext.DrawString(text, textLength, dx, dy, width);
PaintTextDecorations(aRenderingContext, aStyleContext, PaintTextDecorations(aRenderingContext, aStyleContext,
@@ -1263,7 +1265,7 @@ TextFrame::PaintAsciiText(nsIPresContext& aPresContext,
char* text = paintBuf; char* text = paintBuf;
if (0 != textLength) { if (0 != textLength) {
if (!displaySelection || !mSelected) { if (!displaySelection || !mSelected || mSelectionOffset > mContentLength) {
// When there is no selection showing, use the fastest and // When there is no selection showing, use the fastest and
// simplest rendering approach // simplest rendering approach
aRenderingContext.DrawString(text, textLength, dx, dy, width); aRenderingContext.DrawString(text, textLength, dx, dy, width);
@@ -1288,6 +1290,10 @@ TextFrame::PaintAsciiText(nsIPresContext& aPresContext,
selectionEnd = mSelectionOffset; selectionEnd = mSelectionOffset;
selectionOffset = mSelectionEnd; selectionOffset = mSelectionEnd;
} }
if (selectionEnd > textLength)
selectionEnd = textLength;
if (selectionOffset > textLength)
selectionOffset = textLength;
if (selectionOffset == selectionEnd){ if (selectionOffset == selectionEnd){
aRenderingContext.DrawString(text, textLength, dx, dy, width); aRenderingContext.DrawString(text, textLength, dx, dy, width);

8
layout/html/base/src/nsTextFrame.cpp
View File

@@ -827,6 +827,8 @@ TextFrame::PaintUnicodeText(nsIPresContext& aPresContext,
} }
if (selectionEnd > textLength) if (selectionEnd > textLength)
selectionEnd = textLength; selectionEnd = textLength;
if (selectionOffset > textLength)
selectionOffset = textLength;
if (selectionOffset == selectionEnd){ if (selectionOffset == selectionEnd){
aRenderingContext.DrawString(text, textLength, dx, dy, width); aRenderingContext.DrawString(text, textLength, dx, dy, width);
PaintTextDecorations(aRenderingContext, aStyleContext, PaintTextDecorations(aRenderingContext, aStyleContext,
@@ -1263,7 +1265,7 @@ TextFrame::PaintAsciiText(nsIPresContext& aPresContext,
char* text = paintBuf; char* text = paintBuf;
if (0 != textLength) { if (0 != textLength) {
if (!displaySelection || !mSelected) { if (!displaySelection || !mSelected || mSelectionOffset > mContentLength) {
// When there is no selection showing, use the fastest and // When there is no selection showing, use the fastest and
// simplest rendering approach // simplest rendering approach
aRenderingContext.DrawString(text, textLength, dx, dy, width); aRenderingContext.DrawString(text, textLength, dx, dy, width);
@@ -1288,6 +1290,10 @@ TextFrame::PaintAsciiText(nsIPresContext& aPresContext,
selectionEnd = mSelectionOffset; selectionEnd = mSelectionOffset;
selectionOffset = mSelectionEnd; selectionOffset = mSelectionEnd;
} }
if (selectionEnd > textLength)
selectionEnd = textLength;
if (selectionOffset > textLength)
selectionOffset = textLength;
if (selectionOffset == selectionEnd){ if (selectionOffset == selectionEnd){
aRenderingContext.DrawString(text, textLength, dx, dy, width); aRenderingContext.DrawString(text, textLength, dx, dy, width);