github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-04-28 03:00:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove document::show_browser

Browse Source 
Instead use OakDocumentController’s showFileBrowserAtPath:
This commit is contained in:
Allan Odgaard
2016-09-22 15:26:11 +02:00
parent 2f9e1d8a69
commit eef0878538
3 changed files with 58 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

121
Frameworks/DocumentWindow/src/DocumentWindowController.mm
View File

@@ -2787,25 +2787,25 @@ static NSUInteger DisableSessionSavingCount = 0;
return nil;
}
- (void)bringToFront
{
[self showWindow:nil];
if(![NSApp isActive])
{
__weak __block id observerId = [[NSNotificationCenter defaultCenter] addObserverForName:NSApplicationDidBecomeActiveNotification object:NSApp queue:nil usingBlock:^(NSNotification*){
// If our window is not on the active desktop but another one is, the system gives focus to the wrong window.
[self showWindow:nil];
[[NSNotificationCenter defaultCenter] removeObserver:observerId];
}];
[NSApp activateIgnoringOtherApps:YES];
}
}
+ (void)load
{
static struct proxy_t : document::ui_proxy_t
{
private:
static void bring_to_front (DocumentWindowController* aController)
{
[aController showWindow:nil];
if(![NSApp isActive])
{
__weak __block id observerId = [[NSNotificationCenter defaultCenter] addObserverForName:NSApplicationDidBecomeActiveNotification object:NSApp queue:nil usingBlock:^(NSNotification*){
// If our window is not on the active desktop but another one is, the system gives focus to the wrong window.
[aController showWindow:nil];
[[NSNotificationCenter defaultCenter] removeObserver:observerId];
}];
[NSApp activateIgnoringOtherApps:YES];
}
}
static DocumentWindowController* find_or_create_controller (std::vector<document::document_ptr> const& documents, oak::uuid_t const& projectUUID)
{
ASSERT(!documents.empty());
@@ -2901,56 +2901,10 @@ static NSUInteger DisableSessionSavingCount = 0;
}
public:
void show_browser (std::string const& path) const
{
std::string const folder = path::resolve(path);
[[NSDocumentController sharedDocumentController] noteNewRecentDocumentURL:[NSURL fileURLWithPath:[NSString stringWithCxxString:folder]]];
for(DocumentWindowController* candidate in SortedControllers())
{
if(folder == to_s(candidate.projectPath ?: candidate.defaultProjectPath))
return bring_to_front(candidate);
}
DocumentWindowController* controller = nil;
for(DocumentWindowController* candidate in SortedControllers())
{
if(!candidate.fileBrowserVisible && candidate.documents.size() == 1 && is_disposable(candidate.selectedDocument))
{
controller = candidate;
break;
}
}
if(!controller)
controller = [DocumentWindowController new];
else if(controller.selectedDocument)
[controller selectedDocument]->set_custom_name("not untitled"); // release potential untitled token used
NSDictionary* project;
if(![[NSUserDefaults standardUserDefaults] boolForKey:kUserDefaultsDisableFolderStateRestore])
project = [[DocumentWindowController sharedProjectStateDB] valueForKey:[NSString stringWithCxxString:folder]];
if(project && [project[@"documents"] count])
{
[controller setupControllerForProject:project skipMissingFiles:YES];
}
else
{
controller.defaultProjectPath = [NSString stringWithCxxString:folder];
controller.fileBrowserVisible = YES;
controller.documents = { document::create() };
controller.fileBrowser.url = [NSURL fileURLWithPath:[NSString stringWithCxxString:folder]];
[controller openAndSelectDocument:controller.documents[controller.selectedTabIndex]];
}
bring_to_front(controller);
}
void show_documents (std::vector<document::document_ptr> const& documents) const
{
DocumentWindowController* controller = controller_with_documents(documents);
bring_to_front(controller);
[controller bringToFront];
[controller openAndSelectDocument:[controller documents][controller.selectedTabIndex]];
}
@@ -2961,7 +2915,7 @@ static NSUInteger DisableSessionSavingCount = 0;
DocumentWindowController* controller = controller_with_documents({ document }, collection);
if(bringToFront)
bring_to_front(controller);
[controller bringToFront];
else if(![controller.window isVisible])
[controller.window orderWindow:NSWindowBelow relativeTo:[([NSApp keyWindow] ?: [NSApp mainWindow]) windowNumber]];
[controller openAndSelectDocument:document];
@@ -2989,6 +2943,47 @@ static NSUInteger DisableSessionSavingCount = 0;
- (void)showFileBrowserAtPath:(NSString*)aPath
{
document::show_browser(to_s(aPath));
NSString* const folder = to_ns(path::resolve(to_s(aPath)));
[[NSDocumentController sharedDocumentController] noteNewRecentDocumentURL:[NSURL fileURLWithPath:folder]];
for(DocumentWindowController* candidate in SortedControllers())
{
if([folder isEqualToString:candidate.projectPath ?: candidate.defaultProjectPath])
return [candidate bringToFront];
}
DocumentWindowController* controller = nil;
for(DocumentWindowController* candidate in SortedControllers())
{
if(!candidate.fileBrowserVisible && candidate.documents.size() == 1 && is_disposable(candidate.selectedDocument))
{
controller = candidate;
break;
}
}
if(!controller)
controller = [DocumentWindowController new];
else if(controller.selectedDocument)
[controller selectedDocument]->set_custom_name("not untitled"); // release potential untitled token used
NSDictionary* project;
if(![[NSUserDefaults standardUserDefaults] boolForKey:kUserDefaultsDisableFolderStateRestore])
project = [[DocumentWindowController sharedProjectStateDB] valueForKey:folder];
if(project && [project[@"documents"] count])
{
[controller setupControllerForProject:project skipMissingFiles:YES];
}
else
{
controller.defaultProjectPath = folder;
controller.fileBrowserVisible = YES;
controller.documents = { document::create() };
controller.fileBrowser.url = [NSURL fileURLWithPath:folder];
[controller openAndSelectDocument:controller.documents[controller.selectedTabIndex]];
}
[controller bringToFront];
}
@end

5
Frameworks/document/src/collection.cc
View File

@@ -23,11 +23,6 @@ namespace document
ui_proxy()->show_documents(documents);
}
void show_browser (std::string const& path)
{
ui_proxy()->show_browser(path);
}
// ============
// = UI Proxy =
// ============

2
Frameworks/document/src/collection.h
View File

@@ -13,14 +13,12 @@ namespace document
PUBLIC void show (document_ptr document, oak::uuid_t const& collection = kCollectionAny, text::range_t const& selection = text::range_t::undefined, bool bringToFront = true);
PUBLIC void show (std::vector<document_ptr> const& documents);
PUBLIC void show_browser (std::string const& path);
struct PUBLIC ui_proxy_t
{
virtual ~ui_proxy_t () { }
virtual void show_document (oak::uuid_t const& collection, document_ptr document, text::range_t const& range, bool bringToFront) const = 0;
virtual void show_documents (std::vector<document_ptr> const& documents) const = 0;
virtual void show_browser (std::string const& path) const = 0;
};
PUBLIC void set_ui_proxy (ui_proxy_t* proxy);