diff options
| author | Zufu Liu <unknown> | 2019-02-02 10:26:58 +1100 |
|---|---|---|
| committer | Zufu Liu <unknown> | 2019-02-02 10:26:58 +1100 |
| commit | 9cc096e3f7deb6f10512e30da3e589eed927fdd5 (patch) | |
| tree | 2430275cd7bece15c853a71af9fb64267d4476a0 /src/Editor.cxx | |
| parent | 3b23e66a4f754a935f308a5c41a2f08f2968d5c3 (diff) | |
| download | scintilla-mirror-9cc096e3f7deb6f10512e30da3e589eed927fdd5.tar.gz | |
Backport: Feature [feature-requests:#1217]. Implement CARETSTYLE_BLOCK_ALWAYS.
Backport of changeset 7248:aba09a1c7c63.
Diffstat (limited to 'src/Editor.cxx')
| -rw-r--r-- | src/Editor.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Editor.cxx b/src/Editor.cxx index 563b3a665..f48ba333b 100644 --- a/src/Editor.cxx +++ b/src/Editor.cxx @@ -1351,7 +1351,7 @@ Editor::XYScrollPosition Editor::XYScrollToMakeVisible(const SelectionRange &ran newXY.xOffset = static_cast<int>(pt.x + xOffset - rcClient.left) - 2; } else if (pt.x + xOffset >= rcClient.right + newXY.xOffset) { newXY.xOffset = static_cast<int>(pt.x + xOffset - rcClient.right) + 2; - if ((vs.caretStyle == CARETSTYLE_BLOCK) || view.imeCaretBlockOverride) { + if ((vs.caretStyle == CARETSTYLE_BLOCK || vs.caretStyle == CARETSTYLE_BLOCK_ALWAYS) || view.imeCaretBlockOverride) { // Ensure we can see a good portion of the block caret newXY.xOffset += static_cast<int>(vs.aveCharWidth); } @@ -7277,7 +7277,7 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) { return vs.caretcolour.AsInteger(); case SCI_SETCARETSTYLE: - if (wParam <= CARETSTYLE_BLOCK) + if (wParam <= CARETSTYLE_BLOCK_ALWAYS) vs.caretStyle = static_cast<int>(wParam); else /* Default to the line caret */ |