Backed out changeset: 5504b8444ec2

Failed to draw margins correctly after scrolling as the client rectangle wasn't
updated.

1 files changed, 4 insertions, 5 deletions

diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm
index 66962e148..4f4fa1b71 100644
--- a/cocoa/ScintillaCocoa.mm
+++ b/cocoa/ScintillaCocoa.mm
@@ -737,7 +737,10 @@ Scintilla::Internal::Point ScintillaCocoa::GetVisibleOriginInMain() const {
  * The returned value is in document coordinates.
  */
 PRectangle ScintillaCocoa::GetClientRectangle() const {
-	return rectangleClient;
+	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);
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -2030,10 +2033,6 @@ bool ScintillaCocoa::SetScrollingSize() {
 
 void ScintillaCocoa::Resize() {
 	SetScrollingSize();
-
-	NSScrollView *scrollView = ScrollContainer();
-	rectangleClient = NSRectToPRectangle(scrollView.contentView.bounds);
-
 	ChangeSize();
 }