From c7035ded4440532a8ea6db0169268dbdd1f9837d Mon Sep 17 00:00:00 2001 From: Steven Clukey Date: Thu, 24 Jan 2013 12:19:22 -0500 Subject: [PATCH] Added force open in TextMate and fixed confusion when opening an alias. Any file should be able to be opened within TextMate, so Option-DblClick will always do that. I first noticed this with .xib files. Because of the order of the if statements, opening an alias to a package or binary file (or .xib) would not have the previous if statements applied to it. --- Frameworks/OakFileBrowser/src/OakFileBrowser.mm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Frameworks/OakFileBrowser/src/OakFileBrowser.mm b/Frameworks/OakFileBrowser/src/OakFileBrowser.mm index 717c6774..d707f66c 100644 --- a/Frameworks/OakFileBrowser/src/OakFileBrowser.mm +++ b/Frameworks/OakFileBrowser/src/OakFileBrowser.mm @@ -777,16 +777,17 @@ static NSMutableSet* SymmetricDifference (NSMutableSet* aSet, NSMutableSet* anot NSURL* itemURL = item.target ?: item.url; FSItemURLType type = item.urlType; - if(type == FSItemURLTypePackage && OakIsAlternateKeyOrMouseEvent()) - type = FSItemURLTypeFolder; - else if(type == FSItemURLTypeFile && is_binary([itemURL.path fileSystemRepresentation])) - type = FSItemURLTypePackage; - else if(type == FSItemURLTypeAlias) + if(type == FSItemURLTypeAlias) { FSItem* tmp = [FSItem itemWithURL:[NSURL fileURLWithPath:[NSString stringWithCxxString:path::resolve([itemURL.path fileSystemRepresentation])]]]; type = tmp.urlType; itemURL = tmp.target ?: tmp.url; } + + if(type == FSItemURLTypePackage && OakIsAlternateKeyOrMouseEvent()) + type = FSItemURLTypeFolder; + else if(type == FSItemURLTypeFile && is_binary([itemURL.path fileSystemRepresentation]) && !OakIsAlternateKeyOrMouseEvent()) + type = FSItemURLTypePackage; switch(type) {