From 6b2465b650d55a0d0f40aecfd32a719d3f8a945f Mon Sep 17 00:00:00 2001 From: gcasa Date: Tue, 27 Jan 2009 20:33:17 +0000 Subject: [PATCH] This is a temporary change. Commenting out RELEASE(_connections) will be reverted ASAP. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@27706 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 8 +++++++ Source/GSNibLoading.m | 2 +- Source/NSDrawer.m | 50 ++++++++++--------------------------------- 3 files changed, 20 insertions(+), 40 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0f7bfc089..110f8f783 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-01-27 15:28-EST Gregory John Casamento + + * Source/GSNibLoading.m: Temporarily comment out the release of + connections until we find the cause of some current crashes. This + will be reverted ASAP. + * Source/NSDrawer.m: Don't slide the window out, just appear where it + needs to be. + 2009-01-27 Fred Kiefer * Headers/AppKit/NSAttributedString.h: Add missing MacOSX methods. diff --git a/Source/GSNibLoading.m b/Source/GSNibLoading.m index 4499322d2..a200106a4 100644 --- a/Source/GSNibLoading.m +++ b/Source/GSNibLoading.m @@ -1781,7 +1781,7 @@ static BOOL _isInInterfaceBuilder = NO; // free other objects. RELEASE(_accessibilityConnectors); - RELEASE(_connections); + // RELEASE(_connections); RELEASE(_fontManager); RELEASE(_framework); RELEASE(_visibleWindows); diff --git a/Source/NSDrawer.m b/Source/NSDrawer.m index 593f3a311..cbaeff516 100644 --- a/Source/NSDrawer.m +++ b/Source/NSDrawer.m @@ -202,7 +202,7 @@ static NSNotificationCenter *nc = nil; - (void) startTimer { - NSTimeInterval time = 3.0; + NSTimeInterval time = 0.1; _timer = [NSTimer scheduledTimerWithTimeInterval: time target: self selector: @selector(_timedWindowReset) @@ -237,14 +237,14 @@ static NSNotificationCenter *nc = nil; { [self orderFront: self]; [self slide]; - // [self startTimer]; + [self startTimer]; } - (void) closeOnEdge { NSRect frame = [self frameFromParentWindowFrame]; - // [self stopTimer]; + [self stopTimer]; [self slide]; [self setFrame: frame display: YES]; [self orderOut: self]; @@ -260,56 +260,28 @@ static NSNotificationCenter *nc = nil; - (void) slide { NSRect frame = [self frame]; - float i; NSRectEdge edge = [_drawer preferredEdge]; NSSize size = [_drawer maxContentSize]; - float factor = 1.0; - - // if it's open, then slide it closed. - if ([_drawer state] == NSDrawerClosingState) - { - factor = -factor; - } - else if ([_drawer state] == NSDrawerOpeningState) - { - factor = 1.0; - } if (edge == NSMinXEdge) // left { - // slide left... - for (i = 0; i < size.width; i++) - { - frame.origin.x -= factor; - [self setFrame: frame display: YES]; - } + frame.origin.x -= size.width; + [self setFrame: frame display: YES]; } else if (edge == NSMinYEdge) // bottom { - // slide down... - for (i = 0; i < size.height; i++) - { - frame.origin.y -= factor; - [self setFrame: frame display: YES]; - } + frame.origin.y -= size.height; + [self setFrame: frame display: YES]; } else if (edge == NSMaxXEdge) // right { - // slide right... - for (i = 0; i < size.width; i++) - { - frame.origin.x += factor; - [self setFrame: frame display: YES]; - } + frame.origin.x += size.width; + [self setFrame: frame display: YES]; } else if (edge == NSMaxYEdge) // top { - // slide up... - for (i = 0; i < size.height; i++) - { - frame.origin.y += factor; - [self setFrame: frame display: YES]; - } + frame.origin.y += size.height; + [self setFrame: frame display: YES]; } }