From edea6c258b6a2a14fcf47c41c8eceff44cddd8f7 Mon Sep 17 00:00:00 2001
From: nyamatongwe <nyamatongwe@gmail.com>
Date: Tue, 2 Apr 2013 15:45:56 +1100
Subject: Fix autocompletion position for Cocoa using ScrollView.

---
 src/ScintillaBase.cxx | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src')

diff --git a/src/ScintillaBase.cxx b/src/ScintillaBase.cxx
index 1cf146c06..bd096155b 100644
--- a/src/ScintillaBase.cxx
+++ b/src/ScintillaBase.cxx
@@ -235,6 +235,11 @@ void ScintillaBase::AutoCompleteStart(int lenEntered, const char *list) {
 		Redraw();
 		pt = PointMainCaret();
 	}
+	if (wMargin.GetID()) {
+		Point ptOrigin = GetVisibleOriginInMain();
+		pt.x += ptOrigin.x;
+		pt.y += ptOrigin.y;
+	}
 	PRectangle rcac;
 	rcac.left = pt.x - ac.lb->CaretFromEdge();
 	if (pt.y >= rcPopupBounds.bottom - heightLB &&  // Wont fit below.
-- 
cgit v1.2.3