gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-31 19:20:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

This is a temporary change. Commenting out RELEASE(_connections) will be reverted ASAP.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@27706 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
gcasa 2009-01-27 20:33:17 +00:00
parent a8bda5f526
commit 6b2465b650
3 changed files with 20 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2009-01-27 15:28-EST Gregory John Casamento <greg_casamento@yahoo.com>
* 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 <FredKiefer@gmx.de> 2009-01-27 Fred Kiefer <FredKiefer@gmx.de>
* Headers/AppKit/NSAttributedString.h: Add missing MacOSX methods. * Headers/AppKit/NSAttributedString.h: Add missing MacOSX methods.

2
Source/GSNibLoading.m
View file

@ -1781,7 +1781,7 @@ static BOOL _isInInterfaceBuilder = NO;
// free other objects. // free other objects.
RELEASE(_accessibilityConnectors); RELEASE(_accessibilityConnectors);
RELEASE(_connections); // RELEASE(_connections);
RELEASE(_fontManager); RELEASE(_fontManager);
RELEASE(_framework); RELEASE(_framework);
RELEASE(_visibleWindows); RELEASE(_visibleWindows);

50
Source/NSDrawer.m
View file

@ -202,7 +202,7 @@ static NSNotificationCenter *nc = nil;
- (void) startTimer - (void) startTimer
{ {
NSTimeInterval time = 3.0; NSTimeInterval time = 0.1;
_timer = [NSTimer scheduledTimerWithTimeInterval: time _timer = [NSTimer scheduledTimerWithTimeInterval: time
target: self target: self
selector: @selector(_timedWindowReset) selector: @selector(_timedWindowReset)
@ -237,14 +237,14 @@ static NSNotificationCenter *nc = nil;
{ {
[self orderFront: self]; [self orderFront: self];
[self slide]; [self slide];
// [self startTimer]; [self startTimer];
} }
- (void) closeOnEdge - (void) closeOnEdge
{ {
NSRect frame = [self frameFromParentWindowFrame]; NSRect frame = [self frameFromParentWindowFrame];
// [self stopTimer]; [self stopTimer];
[self slide]; [self slide];
[self setFrame: frame display: YES]; [self setFrame: frame display: YES];
[self orderOut: self]; [self orderOut: self];
@ -260,56 +260,28 @@ static NSNotificationCenter *nc = nil;
- (void) slide - (void) slide
{ {
NSRect frame = [self frame]; NSRect frame = [self frame];
float i;
NSRectEdge edge = [_drawer preferredEdge]; NSRectEdge edge = [_drawer preferredEdge];
NSSize size = [_drawer maxContentSize]; 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 if (edge == NSMinXEdge) // left
{ {
// slide left... frame.origin.x -= size.width;
for (i = 0; i < size.width; i++) [self setFrame: frame display: YES];
{
frame.origin.x -= factor;
[self setFrame: frame display: YES];
}
} }
else if (edge == NSMinYEdge) // bottom else if (edge == NSMinYEdge) // bottom
{ {
// slide down... frame.origin.y -= size.height;
for (i = 0; i < size.height; i++) [self setFrame: frame display: YES];
{
frame.origin.y -= factor;
[self setFrame: frame display: YES];
}
} }
else if (edge == NSMaxXEdge) // right else if (edge == NSMaxXEdge) // right
{ {
// slide right... frame.origin.x += size.width;
for (i = 0; i < size.width; i++) [self setFrame: frame display: YES];
{
frame.origin.x += factor;
[self setFrame: frame display: YES];
}
} }
else if (edge == NSMaxYEdge) // top else if (edge == NSMaxYEdge) // top
{ {
// slide up... frame.origin.y += size.height;
for (i = 0; i < size.height; i++) [self setFrame: frame display: YES];
{
frame.origin.y += factor;
[self setFrame: frame display: YES];
}
} }
} }