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

Backport of changeset 8467:cb319e3ab20e.
---
 doc/ScintillaHistory.html | 6 ++++++
 win32/ScintillaWin.cxx    | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index ab887fcb6..8c668f1d8 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -549,6 +549,7 @@
 	<td>Chris Graham</td>
 	<td>Hugues Larrive</td>
 	<td>Prakash Sahni</td>
+	<td>uhf7</td>
     </tr>
     </table>
     <p>
@@ -579,6 +580,11 @@
 	On GTK, allow setting CPPFLAGS (and LDFLAGS for SciTE) to support hardening.
 	<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>
     </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/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index 7e041130c..cc2f6f90e 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -1365,6 +1365,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