Fix for bug #2951353 HotSpotRange clearing when mouse moves out of window.

2 files changed, 7 insertions, 1 deletions

diff --git a/src/Editor.cxx b/src/Editor.cxx
index 876be0004..f9f02788a 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -5621,7 +5621,11 @@ void Editor::DwellEnd(bool mouseMoved) {
 	}
 }
 
-static bool AllowVirtualSpace(int	virtualSpaceOptions, bool rectangular) {
+void Editor::MouseLeave() {
+	SetHotSpotRange(NULL);
+}
+
+static bool AllowVirtualSpace(int virtualSpaceOptions, bool rectangular) {
 	return ((virtualSpaceOptions & SCVS_USERACCESSIBLE) != 0)
 		|| (rectangular && ((virtualSpaceOptions & SCVS_RECTANGULARSELECTION) != 0));
 }
@@ -5897,6 +5901,7 @@ void Editor::ButtonMove(Point pt) {
 		if (vs.fixedColumnWidth > 0) {	// There is a margin
 			if (PointInSelMargin(pt)) {
 				DisplayCursor(Window::cursorReverseArrow);
+				SetHotSpotRange(NULL);
 				return; 	// No need to test for selection
 			}
 		}
diff --git a/src/Editor.h b/src/Editor.h
index ea3718ff3..94454b2d9 100644
--- a/src/Editor.h
+++ b/src/Editor.h
@@ -442,6 +442,7 @@ protected:	// ScintillaBase subclass needs access to much of Editor
 	bool PointInSelMargin(Point pt);
 	void LineSelection(int lineCurrent_, int lineAnchor_);
 	void DwellEnd(bool mouseMoved);
+	void MouseLeave();
 	virtual void ButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, bool alt);
 	void ButtonMove(Point pt);
 	void ButtonUp(Point pt, unsigned int curTime, bool ctrl);