github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-01-22 21:27:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use block-based notification API

Browse Source 
This removes the need for a dummy observer object.
This commit is contained in:
Allan Odgaard
2012-12-31 01:19:21 +01:00
parent c273b3d4fe
commit ef8994ee00
1 changed files with 6 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Frameworks/DocumentWindow/src/DocumentController.mm
View File

@@ -120,41 +120,6 @@ OAK_DEBUG_VAR(DocumentController);
@property (nonatomic, retain) NSString* pathAttributes;
@end
@interface OakUnhideHelper : NSObject
{
DocumentController* controller;
}
@end
@implementation OakUnhideHelper
- (id)initWithController:(DocumentController*)aController
{
if(self = [super init])
{
D(DBF_DocumentController, bug("unhide\n"););
controller = [aController retain];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationDidUnhide:) name:NSApplicationDidUnhideNotification object:NSApp];
[NSApp unhideWithoutActivation];
}
return self;
}
- (void)dealloc
{
[[NSNotificationCenter defaultCenter] removeObserver:self];
[controller release];
[super dealloc];
}
- (void)applicationDidUnhide:(NSNotification*)aNotification
{
D(DBF_DocumentController, bug("\n"););
[[controller window] makeKeyAndOrderFront:nil];
SetFrontProcessWithOptions(&(ProcessSerialNumber){ 0, kCurrentProcess }, kSetFrontProcessFrontWindowOnly);
[self release];
}
@end
static document::document_ptr create_document (NSString* fileBrowserPath)
{
document::document_ptr doc = document::from_content("", settings_for_path(NULL_STR, file::path_attributes(NULL_STR), to_s(fileBrowserPath)).get(kSettingsFileTypeKey, "text.plain"));
@@ -176,7 +141,12 @@ static document::document_ptr create_document (NSString* fileBrowserPath)
{
if([NSApp isHidden])
{
[[OakUnhideHelper alloc] initWithController:aController];
__block id observerId = [[NSNotificationCenter defaultCenter] addObserverForName:NSApplicationDidUnhideNotification object:NSApp queue:nil usingBlock:^(NSNotification*){
[[aController window] makeKeyAndOrderFront:nil];
SetFrontProcessWithOptions(&(ProcessSerialNumber){ 0, kCurrentProcess }, kSetFrontProcessFrontWindowOnly);
[[NSNotificationCenter defaultCenter] removeObserver:observerId];
}];
[NSApp unhideWithoutActivation];
}
else
{