Default value for file browser’s “keep folders on top” now match Finder

textmate · Apr 16, 2021 · 6d4b0ec · 6d4b0ec
1 parent 0fd87c1
commit 6d4b0ec
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/Frameworks/FileBrowser/src/FileBrowserViewController.mm b/Frameworks/FileBrowser/src/FileBrowserViewController.mm
@@ -127,6 +127,15 @@ @implementation FileBrowserViewController
 + (NSSet*)keyPathsForValuesAffectingCanGoBack    { return [NSSet setWithObjects:@"historyIndex", nil]; }
 + (NSSet*)keyPathsForValuesAffectingCanGoForward { return [NSSet setWithObjects:@"historyIndex", nil]; }
 
++ (void)initialize
+{
+	[NSApplication.sharedApplication registerServicesMenuSendTypes:@[ NSFilenamesPboardType, NSURLPboardType ] returnTypes:@[ ]];
+
+	[NSUserDefaults.standardUserDefaults registerDefaults:@{
+		kUserDefaultsFoldersOnTopKey: [[[NSUserDefaults alloc] initWithSuiteName:@"com.apple.finder"] objectForKey:@"_FXSortFoldersFirst"] ?: @NO,
+	}];
+}
+
 - (instancetype)init
 {
 	if(self = [super init])
@@ -2215,11 +2224,6 @@ - (BOOL)previewPanel:(QLPreviewPanel*)previewPanel handleEvent:(NSEvent*)event
 // = Services =
 // ============
 
-+ (void)initialize
-{
-	[NSApplication.sharedApplication registerServicesMenuSendTypes:@[ NSFilenamesPboardType, NSURLPboardType ] returnTypes:@[ ]];
-}
-
 - (id)validRequestorForSendType:(NSString*)sendType returnType:(NSString*)returnType
 {
 	return returnType == nil && sendType != nil && [@[ NSFilenamesPboardType, NSURLPboardType ] containsObject:sendType] ? self : nil;

diff --git a/Frameworks/Preferences/src/Keys.mm b/Frameworks/Preferences/src/Keys.mm
@@ -22,7 +22,6 @@
 	return @{
 		kUserDefaultsHTMLOutputPlacementKey:     @"window",
 		kUserDefaultsFileBrowserPlacementKey:    @"right",
-		kUserDefaultsFoldersOnTopKey:            @YES,
 		kUserDefaultsShowFileExtensionsKey:      @NO,
 		kUserDefaultsEnvironmentVariablesKey:    default_environment(),
 		kUserDefaultsDisableBundleUpdatesKey:    @NO,