diff options
| author | nyamatongwe <unknown> | 2012-01-12 23:26:15 +1100 |
|---|---|---|
| committer | nyamatongwe <unknown> | 2012-01-12 23:26:15 +1100 |
| commit | 279605cefc6da6fbd11af33b454b188994a2c97b (patch) | |
| tree | 2df8a9fd096cee1322698086466af8931086f7a9 | |
| parent | 4afa55836bb269c649885d04e0fdc195632074da (diff) | |
| download | scintilla-mirror-279605cefc6da6fbd11af33b454b188994a2c97b.tar.gz | |
Fix extra carets in wrapped text under DirectWrite. Bug #3471998.
| -rw-r--r-- | src/Editor.cxx | 4 | ||||
| -rw-r--r-- | src/Editor.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Editor.cxx b/src/Editor.cxx index 87a12ef8a..35a21c36c 100644 --- a/src/Editor.cxx +++ b/src/Editor.cxx @@ -2517,7 +2517,7 @@ void DrawTextBlob(Surface *surface, ViewStyle &vsDraw, PRectangle rcSegment, } void Editor::DrawEOL(Surface *surface, ViewStyle &vsDraw, PRectangle rcLine, LineLayout *ll, - int line, int lineEnd, int xStart, int subLine, int subLineStart, + int line, int lineEnd, int xStart, int subLine, XYACCUMULATOR subLineStart, bool overrideBackground, ColourDesired background, bool drawWrapMarkEnd, ColourDesired wrapColour) { @@ -2847,7 +2847,7 @@ void Editor::DrawLine(Surface *surface, ViewStyle &vsDraw, int line, int lineVis int posLineStart = pdoc->LineStart(line); int startseg = ll->LineStart(subLine); - int subLineStart = ll->positions[startseg]; + XYACCUMULATOR subLineStart = ll->positions[startseg]; if (subLine >= ll->lines) { DrawAnnotation(surface, vsDraw, line, xStart, rcLine, ll, subLine); return; // No further drawing diff --git a/src/Editor.h b/src/Editor.h index fa2b95440..90a109cc3 100644 --- a/src/Editor.h +++ b/src/Editor.h @@ -373,7 +373,7 @@ protected: // ScintillaBase subclass needs access to much of Editor void DrawIndentGuide(Surface *surface, int lineVisible, int lineHeight, int start, PRectangle rcSegment, bool highlight); void DrawWrapMarker(Surface *surface, PRectangle rcPlace, bool isEndMarker, ColourDesired wrapColour); void DrawEOL(Surface *surface, ViewStyle &vsDraw, PRectangle rcLine, LineLayout *ll, - int line, int lineEnd, int xStart, int subLine, int subLineStart, + int line, int lineEnd, int xStart, int subLine, XYACCUMULATOR subLineStart, bool overrideBackground, ColourDesired background, bool drawWrapMark, ColourDesired wrapColour); void DrawIndicator(int indicNum, int startPos, int endPos, Surface *surface, ViewStyle &vsDraw, |