gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-30 18:30:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Menu location save/restore fixes

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@5685 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
richard 2000-01-07 16:46:35 +00:00
parent 16976fdfb4
commit 662ef633d3
4 changed files with 176 additions and 219 deletions
Download patch file Download diff file Expand all files Collapse all files

86
Source/NSWindow.m
View file

@ -63,8 +63,6 @@
#include <AppKit/NSGraphicsContext.h>
#include <AppKit/GSWraps.h>
@class NSMenuWindow;
BOOL GSViewAcceptsDrag(NSView *v, id<NSDraggingInfo> dragInfo);
@interface GSWindowView : NSView
@ -2311,32 +2309,7 @@ resetCursorRectsForView(NSView *theView)
[windowsLock lock];
defs = [NSUserDefaults standardUserDefaults];
obj = [self stringWithSavedFrame];
if ([self isKindOfClass: [NSMenuWindow class]])
{
id dict;
key = @"NSMenuLocations";
dict = [defs objectForKey: key];
if (dict == nil)
{
dict = [NSMutableDictionary dictionaryWithCapacity: 1];
}
else if ([dict isKindOfClass: [NSDictionary class]] == NO)
{
NSLog(@"NSMenuLocations default is not a dictionary - overwriting");
dict = [NSMutableDictionary dictionaryWithCapacity: 1];
}
else
{
dict = AUTORELEASE([dict mutableCopy]);
}
[dict setObject: obj forKey: name];
obj = dict;
}
else
{
key = [NSString stringWithFormat: @"NSWindow Frame %@", name];
}
key = [NSString stringWithFormat: @"NSWindow Frame %@", name];
[defs setObject: obj forKey: key];
[windowsLock unlock];
}
@ -2381,33 +2354,8 @@ resetCursorRectsForView(NSView *theView)
* Autosave name cleared - remove from defaults database.
*/
defs = [NSUserDefaults standardUserDefaults];
if ([self isKindOfClass: [NSMenuWindow class]])
{
id dict;
key = @"NSMenuLocations";
dict = [defs objectForKey: key];
if (dict == nil)
{
dict = [NSMutableDictionary dictionaryWithCapacity: 1];
}
else if ([dict isKindOfClass: [NSDictionary class]] == NO)
{
NSLog(@"NSMenuLocations is not a dictionary - overwriting");
dict = [NSMutableDictionary dictionaryWithCapacity: 1];
}
else
{
dict = AUTORELEASE([dict mutableCopy]);
}
[dict removeObjectForKey: nameToRemove];
[defs setObject: dict forKey: key];
}
else
{
key = [NSString stringWithFormat: @"NSWindow Frame %@", nameToRemove];
[defs removeObjectForKey: key];
}
key = [NSString stringWithFormat: @"NSWindow Frame %@", nameToRemove];
[defs removeObjectForKey: key];
RELEASE(nameToRemove);
}
[windowsLock unlock];
@ -2531,32 +2479,12 @@ resetCursorRectsForView(NSView *theView)
{
NSUserDefaults *defs;
id obj;
NSString *key;
[windowsLock lock];
defs = [NSUserDefaults standardUserDefaults];
if ([self isKindOfClass: [NSMenuWindow class]] == YES)
{
obj = [defs objectForKey: @"NSMenuLocations"];
if (obj != nil)
{
if ([obj isKindOfClass: [NSDictionary class]] == YES)
{
obj = [obj objectForKey: name];
}
else
{
NSLog(@"NSMenuLocations default is not a dictionary");
obj = nil;
}
}
}
else
{
NSString *key;
key = [NSString stringWithFormat: @"NSWindow Frame %@", name];
obj = [defs objectForKey: key];
}
key = [NSString stringWithFormat: @"NSWindow Frame %@", name];
obj = [defs objectForKey: key];
[windowsLock unlock];
if (obj == nil)
return NO;
@ -2564,7 +2492,7 @@ resetCursorRectsForView(NSView *theView)
return YES;
}
- (NSString *) stringWithSavedFrame
- (NSString*) stringWithSavedFrame
{
NSRect fRect;
NSRect sRect;