From b9f192771d1f64929f22bb1670c38fcb09d8417a Mon Sep 17 00:00:00 2001
From: Nicola Pero <n.pero@mi.flashnet.it>
Date: Fri, 8 Sep 2000 17:07:04 +0000
Subject: [PATCH] Various fixes and some new code for proper management of very
 big window

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@7451 72102866-910b-0410-8b05-ffd578937521
---
 Source/NSWindow.m | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/Source/NSWindow.m b/Source/NSWindow.m
index fe25879c5..47c167c87 100644
--- a/Source/NSWindow.m
+++ b/Source/NSWindow.m
@@ -583,7 +583,6 @@ static NSMapTable* windowmaps = NULL;
 		    screen: (NSScreen*)aScreen
 {
   NSGraphicsContext	*context = GSCurrentContext();
-  NSRect		r = [[NSScreen mainScreen] frame];
   NSRect		cframe;
 
   NSDebugLog(@"NSWindow default initializer\n");
@@ -605,7 +604,7 @@ static NSMapTable* windowmaps = NULL;
   _frame = [NSWindow frameRectForContentRect: contentRect styleMask: aStyle];
   _minimumSize = NSMakeSize(_frame.size.width - contentRect.size.width + 1,
     _frame.size.height - contentRect.size.height + 1);
-  _maximumSize = r.size;
+  _maximumSize = NSMakeSize (10e4, 10e4);
 
   [self setNextResponder: NSApp];
 
@@ -1177,15 +1176,35 @@ static NSMapTable* windowmaps = NULL;
 
   origin.x = (screenSize.width - _frame.size.width) / 2;
   origin.y = (screenSize.height - _frame.size.height) / 2;
+
   [self setFrameOrigin: origin];
 }
 
 - (NSRect) constrainFrameRect: (NSRect)frameRect toScreen: screen
 {
-  NSRect	r = [screen frame];
+  NSRect screenRect = [screen frame];
+  float difference;
 
-  r = NSIntersectionRect(r, frameRect);
-  return r;
+  /* Move top edge of the window inside the screen */
+  difference = NSMaxY (frameRect) - NSMaxY (screenRect);
+
+  if (difference > 0)
+    {
+      frameRect.origin.y -= difference;
+    }
+  
+  /* If the window is resizable, resize it (if needed) so that the
+     bottom edge is on the screen too */
+  if (_styleMask & NSResizableWindowMask)
+    {
+      difference = screenRect.origin.y - frameRect.origin.y;
+      if (difference > 0)
+	{
+	  frameRect.size.height -= difference;
+	}
+    }
+
+  return frameRect;
 }
 
 - (NSRect) frame
@@ -1217,6 +1236,8 @@ static NSMapTable* windowmaps = NULL;
 {
   NSNotificationCenter	*nc = [NSNotificationCenter defaultCenter];
 
+  frameRect = [self constrainFrameRect: frameRect toScreen: [self screen]];
+  
   if (_maximumSize.width > 0 && frameRect.size.width > _maximumSize.width)
     {
       frameRect.size.width = _maximumSize.width;