diff options
| author | Neil <nyamatongwe@gmail.com> | 2019-06-21 07:16:45 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2019-06-21 07:16:45 +1000 |
| commit | 8b8e1f383f0dbabc5e2f4666f4c5aa8860a91848 (patch) | |
| tree | f398bde19d8e842fd4a4185f89775de5f876ec33 /src/EditView.cxx | |
| parent | 1db15a4f04a7c337b8061efe3ef033b21bba0cec (diff) | |
| download | scintilla-mirror-8b8e1f383f0dbabc5e2f4666f4c5aa8860a91848.tar.gz | |
Backport: Bug [#2106]. Place line caret in correct location for line caret with block OVR.
That is for CARETSTYLE_LINE | CARETSTYLE_BLOCK mode.
Backport of changeset 7608:b725657be4ae.
Diffstat (limited to 'src/EditView.cxx')
| -rw-r--r-- | src/EditView.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/EditView.cxx b/src/EditView.cxx index fdcd9f287..6850d0964 100644 --- a/src/EditView.cxx +++ b/src/EditView.cxx @@ -1334,7 +1334,9 @@ void EditView::DrawCarets(Surface *surface, const EditModel &model, const ViewSt 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 ((vsDraw.DrawCaretInsideSelection(model.inOverstrike, imeCaretBlockOverride)) && + !drawDrag && + posCaret > model.sel.Range(r).anchor) { if (posCaret.VirtualSpace() > 0) posCaret.SetVirtualSpace(posCaret.VirtualSpace() - 1); else |