From 36a8db7334b7f5c8f27c3d1a1499cb8cf8133493 Mon Sep 17 00:00:00 2001
From: uhf7 <unknown>
Date: Mon, 3 Aug 2020 13:33:52 +1000
Subject: Backport: Bug [#2193]. Fixed bug where hovered indicator was not
 returning to non-hover appearance when mouse moved out of window or into
 margin.

Backport of changeset 8472:2f8f87a7d57f.
---
 doc/ScintillaHistory.html | 5 +++++
 src/Editor.cxx            | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 8c668f1d8..e9b241752 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -585,6 +585,11 @@
 	indicator with hover style.
 	<a href="https://sourceforge.net/p/scintilla/bugs/2170/">Bug #2170</a>.
 	</li>
+	<li>
+	Fixed bug where hovered indicator was not returning to non-hover
+	appearance when mouse moved out of window or into margin.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2193/">Bug #2193</a>.
+	</li>
     </ul>
     <h3>
        <a href="https://sourceforge.net/projects/scintilla/files/scintilla/3.21.0/scintilla3210.zip/download">Release 3.21.0</a>
diff --git a/src/Editor.cxx b/src/Editor.cxx
index 962f62cf1..8ff94b39f 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -4502,6 +4502,7 @@ void Editor::DwellEnd(bool mouseMoved) {
 
 void Editor::MouseLeave() {
 	SetHotSpotRange(nullptr);
+	SetHoverIndicatorPosition(Sci::invalidPosition);
 	if (!HaveMouseCapture()) {
 		ptMouseLast = Point(-1, -1);
 		DwellEnd(true);
@@ -4870,6 +4871,7 @@ void Editor::ButtonMoveWithModifiers(Point pt, unsigned int, int modifiers) {
 			if (PointInSelMargin(pt)) {
 				DisplayCursor(GetMarginCursor(pt));
 				SetHotSpotRange(nullptr);
+				SetHoverIndicatorPosition(Sci::invalidPosition);
 				return; 	// No need to test for selection
 			}
 		}
-- 
cgit v1.2.3