From 8c93fbff2d065993e14ddb250026063456c53883 Mon Sep 17 00:00:00 2001
From: Neil Hodgson <nyamatongwe@gmail.com>
Date: Thu, 16 Aug 2018 09:11:18 +1000
Subject: Backport: For reverse arrow margin cursor, move hotspot to the tip of
 the arrow. This fixes a bug where clicking seemed to affect the wrong margin.

Backport of changeset 7075:bcf0028997ea.
---
 cocoa/ScintillaView.mm    | 2 +-
 doc/ScintillaHistory.html | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/cocoa/ScintillaView.mm b/cocoa/ScintillaView.mm
index f09af9fa4..5ff9457d4 100644
--- a/cocoa/ScintillaView.mm
+++ b/cocoa/ScintillaView.mm
@@ -1315,7 +1315,7 @@ sourceOperationMaskForDraggingContext: (NSDraggingContext) context
 
     path = [bundle pathForResource: @"mac_cursor_flipped" ofType: @"tiff" inDirectory: nil];
     image = [[[NSImage alloc] initWithContentsOfFile: path] autorelease];
-    reverseArrowCursor = [[NSCursor alloc] initWithImage: image hotSpot: NSMakePoint(12, 2)];
+    reverseArrowCursor = [[NSCursor alloc] initWithImage: image hotSpot: NSMakePoint(15, 2)];
   }
 }
 
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 8f4d17920..bda608c48 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -552,6 +552,9 @@
 	Lexers added for SAS and Stata.
 	<a href="https://sourceforge.net/p/scintilla/feature-requests/1185/">Feature #1185.</a>
 	</li>
+	<li>
+	Fix margin cursor on Cocoa to point more accurately.
+	</li>
     </ul>
     <h3>
 		<a href="https://sourceforge.net/projects/scintilla/files/scintilla/3.10.0/scintilla3100.zip/download">Release 3.10.0</a>
-- 
cgit v1.2.3