diff options
| author |   mitchell <70453897+667e-11@users.noreply.github.com> | 2017-10-06 10:50:01 -0400 |
|---|---|---|
| committer | mitchell <70453897+667e-11@users.noreply.github.com> | 2017-10-06 10:50:01 -0400 |
| commit | a2e561fbe9822a4ecb79161b4bb3c16aee91bfd9 (patch) | |
| tree | 04ab87f25ba113664a83fb2ebae5bba5e3139c59 /src/scintilla.patch | |
| parent | 00a0e797ab742020c15f856b672af0673c054cbb (diff) | |
| download | textadept-a2e561fbe9822a4ecb79161b4bb3c16aee91bfd9.tar.gz textadept-a2e561fbe9822a4ecb79161b4bb3c16aee91bfd9.zip | |
Patched Scintilla to revert caret block placement change introduced in 9.3.
Diffstat (limited to 'src/scintilla.patch')
| -rw-r--r-- | src/scintilla.patch | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/scintilla.patch b/src/scintilla.patch index 6a836ac6..9b956f41 100644 --- a/src/scintilla.patch +++ b/src/scintilla.patch @@ -191,3 +191,20 @@ diff -r bfdfb44eb777 src/Document.cxx +} + +#endif +--- a/src/EditView.cxx 2017-10-06 14:21:52.634733696 +0200 ++++ b/src/EditView.cxx 2017-10-06 15:06:12.449296662 +0200 +@@ -1328,13 +1328,7 @@ + // For each selection draw + for (size_t r = 0; (r<model.sel.Count()) || drawDrag; r++) { + const bool mainCaret = r == model.sel.Main(); +- SelectionPosition posCaret = (drawDrag ? model.posDrag : model.sel.Range(r).caret); +- if (vsDraw.caretStyle == CARETSTYLE_BLOCK && !drawDrag && posCaret > model.sel.Range(r).anchor) { +- if (posCaret.VirtualSpace() > 0) +- posCaret.SetVirtualSpace(posCaret.VirtualSpace() - 1); +- else +- posCaret.SetPosition(model.pdoc->MovePositionOutsideChar(posCaret.Position()-1, -1)); +- } ++ const SelectionPosition posCaret = (drawDrag ? model.posDrag : model.sel.Range(r).caret); + const int offset = posCaret.Position() - posLineStart; + const XYPOSITION spaceWidth = vsDraw.styles[ll->EndLineStyle()].spaceWidth; + const XYPOSITION virtualOffset = posCaret.VirtualSpace() * spaceWidth; |