From d3edcc88f7534bd3456596ea683e4a74ad6f231c Mon Sep 17 00:00:00 2001
From: uhf7 <unknown>
Date: Fri, 31 Jul 2020 08:17:33 +1000
Subject: Bug [#2170]. Fixed cursor flicker over an indicator with hover style.

---
 doc/ScintillaHistory.html | 6 ++++++
 win32/ScintillaWin.cxx    | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index ff7655a29..d25f79c92 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -558,6 +558,7 @@
 	<td>Prakash Sahni</td>
       </tr><tr>
 	<td>Michel Sauvard</td>
+	<td>uhf7</td>
     </tr>
     </table>
     <p>
@@ -589,6 +590,11 @@
 	<a href="https://sourceforge.net/p/scintilla/bugs/2191/">Bug #2191</a>.
 	</li>
 	<li>
+	Fixed bug on Win32 where cursor was flickering between hand and text over an
+	indicator with hover style.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2170/">Bug #2170</a>.
+	</li>
+	<li>
 	Fixed a bug in SciTE with stack balance when a syntax error in the Lua startup script
 	caused continuing failures to find functions after the syntax error was corrected.
 	<a href="https://sourceforge.net/p/scintilla/bugs/2176/">Bug #2176</a>.
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index 01eb13883..7c5c1a6ae 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -1377,6 +1377,8 @@ Window::Cursor ScintillaWin::ContextCursor() {
 				return Window::cursorArrow;
 			} else if (PointIsHotspot(PointFromPOINT(pt))) {
 				return Window::cursorHand;
+			} else if (hoverIndicatorPos != Sci::invalidPosition) {
+				return Window::cursorHand;
 			}
 		}
 	}
-- 
cgit v1.2.3