diff options
| author | Neil <nyamatongwe@gmail.com> | 2021-05-19 14:48:00 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2021-05-19 14:48:00 +1000 |
| commit | 45934586be616146b0af470983ba8963e869bd36 (patch) | |
| tree | c15d2d0ca025529abac8ad52e03f86e1c5e88850 /src | |
| parent | cbf05ab19171c3d092fa424e010fc2380ea8d45f (diff) | |
| download | scintilla-mirror-45934586be616146b0af470983ba8963e869bd36.tar.gz | |
Bug [#2253]. Remove SC_ELEMENT_CARET_SECONDARY as it caused unexpected change to
caret appearance for empty selection as empty selections can not be primary.
Diffstat (limited to 'src')
| -rw-r--r-- | src/EditView.cxx | 4 | ||||
| -rw-r--r-- | src/ViewStyle.cxx | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/EditView.cxx b/src/EditView.cxx index a8dffa792..1f92b44c0 100644 --- a/src/EditView.cxx +++ b/src/EditView.cxx @@ -1641,9 +1641,7 @@ void EditView::DrawCarets(Surface *surface, const EditModel &model, const ViewSt rcCaret.left = std::round(xposCaret - caretWidthOffset); rcCaret.right = rcCaret.left + vsDraw.caret.width; } - int elementCaret = mainCaret ? SC_ELEMENT_CARET : SC_ELEMENT_CARET_ADDITIONAL; - if (!model.primarySelection) - elementCaret = SC_ELEMENT_CARET_SECONDARY; + const int elementCaret = mainCaret ? SC_ELEMENT_CARET : SC_ELEMENT_CARET_ADDITIONAL; const ColourAlpha caretColour = *vsDraw.ElementColour(elementCaret); //assert(caretColour.IsOpaque()); if (drawBlockCaret) { diff --git a/src/ViewStyle.cxx b/src/ViewStyle.cxx index ca59fef2c..4e88d9116 100644 --- a/src/ViewStyle.cxx +++ b/src/ViewStyle.cxx @@ -230,11 +230,9 @@ void ViewStyle::Init(size_t stylesSize_) { elementBaseColours[SC_ELEMENT_CARET] = ColourAlpha(0, 0, 0); elementBaseColours[SC_ELEMENT_CARET_ADDITIONAL] = ColourAlpha(0x7f, 0x7f, 0x7f); - elementBaseColours[SC_ELEMENT_CARET_SECONDARY] = ColourAlpha(0, 0, 0, 0x40); elementAllowsTranslucent.insert({ SC_ELEMENT_CARET, SC_ELEMENT_CARET_ADDITIONAL, - SC_ELEMENT_CARET_SECONDARY, }); caret.style = CARETSTYLE_LINE; caret.width = 1; |