Patch by george comitted

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@10608 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2001-07-30 14:17:37 +00:00
parent 9ddbce9285
commit 911b5993e8
2 changed files with 9 additions and 4 deletions

View file

@ -1,3 +1,10 @@
2001-07-30 Georg Fleischmann
* gui/Source/NSWindow.m
[NSWindow orderWindow:relativeTo:]: constrain added
[NSWindow initWithContentRect:styleMask:backing:defer:screen:] and
[NSWindow setFrame:]: constrain removed
2000-07-28 Fred Kiefer <FredKiefer@gmx.de>
* Headers/gnustep/gui/NSUserInterfaceValidation.h

View file

@ -677,7 +677,6 @@ static NSMapTable* windowmaps = NULL;
_styleMask = aStyle;
_frame = [NSWindow frameRectForContentRect: contentRect styleMask: aStyle];
_frame = [self constrainFrameRect: _frame toScreen: [self screen]];
_minimumSize = NSMakeSize(_frame.size.width - contentRect.size.width + 1,
_frame.size.height - contentRect.size.height + 1);
_maximumSize = NSMakeSize (10e4, 10e4);
@ -1142,8 +1141,9 @@ static NSMapTable* windowmaps = NULL;
}
else
{
_frame = [self constrainFrameRect:_frame toScreen:[self screen]];
// create deferred window
if(_windowNum == 0)
if (_windowNum == 0)
{
[self _initBackendWindow: _frame];
display = YES;
@ -1339,8 +1339,6 @@ 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;