From b751ba07f93039c6aeb89c7aec4aa6e75d997233 Mon Sep 17 00:00:00 2001
From: richard <richard@72102866-910b-0410-8b05-ffd578937521>
Date: Wed, 8 Mar 2000 14:15:17 +0000
Subject: [PATCH] Coordinate handling fixes.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@6213 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog         | 6 ++++++
 Source/NSWindow.m | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 18e251787..44a2ef280 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Mar 08 13:15:00 2000  Richard Frith-Macdonald <richard@brainstorm.co.uk>
+
+	* Source/NSWindow.m: Final (I hope) coordinate handling fixes to
+	use proper frame coordinates and offsets now that support is in
+	backend and WindowMaker bugs are fixed.
+
 Wed Mar 08 07:44:00 2000  Richard Frith-Macdonald <richard@brainstorm.co.uk>
 
 	* Source/NSText.m: Fixes by Fred Kiefer for rich text display.
diff --git a/Source/NSWindow.m b/Source/NSWindow.m
index de300f150..874c249fc 100644
--- a/Source/NSWindow.m
+++ b/Source/NSWindow.m
@@ -2372,6 +2372,8 @@ resetCursorRectsForView(NSView *theView)
 	      case GSAppKitWindowMoved:
 		frame.origin.x = (float)[theEvent data1];
 		frame.origin.y = (float)[theEvent data2];
+		NSDebugLLog(@"Moving", @"Move event: %d %@",
+		  window_num, NSStringFromPoint(frame.origin));
 		if (autosave_name != nil)
 		  {
 		    [self saveFrameUsingName: autosave_name];
@@ -2390,6 +2392,8 @@ resetCursorRectsForView(NSView *theView)
 		{
 		  NSRect	rect = frame;
 
+		  rect = [NSWindow contentRectForFrameRect: rect
+						 styleMask: style_mask];
 		  rect.origin = NSZeroPoint;
 		  [_wv setFrame: rect];
 		  [_wv setNeedsDisplay: YES];
@@ -2398,6 +2402,7 @@ resetCursorRectsForView(NSView *theView)
 		[nc postNotificationName: NSWindowDidResizeNotification
 				  object: self];
 		break;
+
 	      case GSAppKitWindowClose:
 		[self performClose: NSApp];
 		break;