diff options
| -rw-r--r-- | doc/ScintillaHistory.html | 4 | ||||
| -rw-r--r-- | src/Editor.cxx | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 22cd4fe44..b8feb1350 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -604,6 +604,10 @@ Increase maximum zoom set interactively to +60 points. <a href="https://sourceforge.net/p/scintilla/feature-requests/1517/">Feature #1517</a>. </li> + <li> + Fix flickering cursor after some mouse action sequences. + <a href="https://sourceforge.net/p/scintilla/bugs/2443/">Bug #2443</a>. + </li> </ul> <h3> <a href="https://www.scintilla.org/scintilla550.zip">Release 5.5.0</a> diff --git a/src/Editor.cxx b/src/Editor.cxx index 12150dcda..e39ab622c 100644 --- a/src/Editor.cxx +++ b/src/Editor.cxx @@ -5186,7 +5186,12 @@ void Editor::TickFor(TickReason reason) { break; case TickReason::scroll: // Auto scroll - ButtonMoveWithModifiers(ptMouseLast, 0, KeyMod::Norm); + if (HaveMouseCapture()) { + ButtonMoveWithModifiers(ptMouseLast, 0, KeyMod::Norm); + } else { + // Capture cancelled so cancel timer + FineTickerCancel(TickReason::scroll); + } break; case TickReason::widen: SetScrollBars(); |