diff options
| author | Neil <nyamatongwe@gmail.com> | 2014-07-24 12:54:03 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2014-07-24 12:54:03 +1000 |
| commit | 7afb5fb389fe0c59e6952e1f5b6861105fab3bad (patch) | |
| tree | c442c43737c8d77ce966c18424ad15da0fc72664 /src/EditView.cxx | |
| parent | d5e666a8e7f6297a9838793611086b048d04fd58 (diff) | |
| download | scintilla-mirror-7afb5fb389fe0c59e6952e1f5b6861105fab3bad.tar.gz | |
Using separate variable imeCaretBlockOverride for IME mode instead of changing
caretStyle as there could be confusion if the container changes caret style.
Diffstat (limited to 'src/EditView.cxx')
| -rw-r--r-- | src/EditView.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/EditView.cxx b/src/EditView.cxx index 58d8a1415..b033c7cf6 100644 --- a/src/EditView.cxx +++ b/src/EditView.cxx @@ -177,6 +177,7 @@ EditView::EditView() { lineWidthMaxSeen = 0; additionalCaretsBlink = true; additionalCaretsVisible = true; + imeCaretBlockOverride = false; pixmapLine = 0; pixmapIndentGuide = 0; pixmapIndentGuideHighlight = 0; @@ -1117,7 +1118,7 @@ void EditView::DrawCarets(Surface *surface, const EditModel &model, const ViewSt rcCaret.top = rcCaret.bottom - 2; rcCaret.left = xposCaret + 1; rcCaret.right = rcCaret.left + widthOverstrikeCaret - 1; - } else if (vsDraw.caretStyle == CARETSTYLE_BLOCK) { + } else if ((vsDraw.caretStyle == CARETSTYLE_BLOCK) || imeCaretBlockOverride) { /* Block caret */ rcCaret.left = xposCaret; if (!caretAtEOL && !caretAtEOF && (ll->chars[offset] != '\t') && !(IsControlCharacter(ll->chars[offset]))) { |