diff options
| author |  mitchell <70453897+667e-11@users.noreply.github.com> | 2019-09-01 15:28:28 -0400 |
|---|---|---|
| committer | mitchell <70453897+667e-11@users.noreply.github.com> | 2019-09-01 15:28:28 -0400 |
| commit | e7f6c48964fc77d8d4781884c68112010d1c4b36 (patch) | |
| tree | c62170d4330be9ed0f1940390f5e52ee2b1ad705 | |
| parent | d08d115b1d1ebb4a154e441ff16b619bad4a87b0 (diff) | |
Removed unnecessary Scintilla patch.
Block caret placement is now configurable.
| -rw-r--r-- | src/scintilla.patch | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/src/scintilla.patch b/src/scintilla.patch index f9f1a294..9569e577 100644 --- a/src/scintilla.patch +++ b/src/scintilla.patch @@ -18,24 +18,6 @@ Only link the LPeg lexer. return 1; } -Revert caret block placement change introduced by Scintilla 3.7.3. ---- 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.IsBlockCaretStyle() || imeCaretBlockOverride) && !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 = static_cast<int>(posCaret.Position() - posLineStart); - const XYPOSITION spaceWidth = vsDraw.styles[ll->EndLineStyle()].spaceWidth; - const XYPOSITION virtualOffset = posCaret.VirtualSpace() * spaceWidth; Hijack SCI_LOADLEXERLIBRARY for programmatically setting input method. This is helpful on newer version of Mac OSX, where changing the input method is flaky. |