Fix automatic scrolling on Cocoa.

2 files changed, 4 insertions, 2 deletions

diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm
index 2833e7846..e348488ff 100644
--- a/cocoa/ScintillaCocoa.mm
+++ b/cocoa/ScintillaCocoa.mm
@@ -724,8 +724,8 @@ Scintilla::Point ScintillaCocoa::GetVisibleOriginInMain()
  */
 PRectangle ScintillaCocoa::GetClientRectangle()
 {
-  NSView* host = ContentView();
-  NSSize size = [[host superview] frame].size;
+  NSScrollView *scrollView = ScrollContainer();
+  NSSize size = [[scrollView contentView] bounds].size;
   Point origin = GetVisibleOriginInMain();
   return PRectangle(origin.x, origin.y, origin.x+size.width, origin.y + size.height);
 }
diff --git a/src/Editor.cxx b/src/Editor.cxx
index d02f095cb..c2731a1e3 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -1240,7 +1240,9 @@ Editor::XYScrollPosition Editor::XYScrollToMakeVisible(const SelectionRange rang
 	Point ptAnchor = LocationFromPosition(range.anchor);
 	const Point ptOrigin = GetVisibleOriginInMain();
 	pt.x += ptOrigin.x;
+	pt.y += ptOrigin.y;
 	ptAnchor.x += ptOrigin.x;
+	ptAnchor.y += ptOrigin.y;
 	const Point ptBottomCaret(pt.x, pt.y + vs.lineHeight - 1);
 
 	XYScrollPosition newXY(xOffset, topLine);