diff options
| author | nyamatongwe <devnull@localhost> | 2007-07-25 02:45:37 +0000 |
|---|---|---|
| committer | nyamatongwe <devnull@localhost> | 2007-07-25 02:45:37 +0000 |
| commit | 340983e94342aaf907025ba84c32f7017ceed579 (patch) | |
| tree | 8bfbeda92365295ea35c52ca32bf6ceb3df8f00a /src/Editor.cxx | |
| parent | 5c8d9997e79ce61adbe653e639b7cfe22555a42d (diff) | |
| download | scintilla-mirror-340983e94342aaf907025ba84c32f7017ceed579.tar.gz | |
Fixed bugs where caret was not shown at start of wrapped lines or was shown
at both the start of one line and the end of the previous line.
Diffstat (limited to 'src/Editor.cxx')
| -rw-r--r-- | src/Editor.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/Editor.cxx b/src/Editor.cxx index 3373424da..b27775750 100644 --- a/src/Editor.cxx +++ b/src/Editor.cxx @@ -2915,8 +2915,7 @@ void Editor::Paint(Surface *surfaceWindow, PRectangle rcArea) { // Draw the Caret if (lineDoc == lineCaret) { int offset = Platform::Minimum(posCaret - rangeLine.start, ll->maxLineLength); - if ((offset >= ll->LineStart(subLine)) && - ((offset < ll->LineStart(subLine + 1)) || offset == ll->numCharsInLine)) { + if (ll->InLine(offset, subLine)) { int xposCaret = ll->positions[offset] - ll->positions[ll->LineStart(subLine)] + xStart; if (actualWrapVisualStartIndent != 0) { @@ -2945,7 +2944,7 @@ void Editor::Paint(Surface *surfaceWindow, PRectangle rcArea) { if (widthOverstrikeCaret < 3) // Make sure its visible widthOverstrikeCaret = 3; - if (offset > 0) + if (offset > ll->LineStart(subLine)) caretWidthOffset = 1; // Move back so overlaps both character cells. if (posDrag >= 0) { /* Dragging text, use a line caret */ |