From 2c58bb80f956a95a2b102b28283ffc3d2331ff51 Mon Sep 17 00:00:00 2001 From: Allan Odgaard Date: Wed, 29 Oct 2014 20:47:31 +0100 Subject: [PATCH] =?UTF-8?q?Introduce=20=E2=80=98disableTabAutoClose?= =?UTF-8?q?=E2=80=99=20defaults=20key?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This disables tabs from closing when the tab bar overflows. --- Frameworks/DocumentWindow/src/DocumentController.mm | 2 +- Frameworks/Preferences/src/Keys.h | 1 + Frameworks/Preferences/src/Keys.mm | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Frameworks/DocumentWindow/src/DocumentController.mm b/Frameworks/DocumentWindow/src/DocumentController.mm index 5e642607..37b8bd73 100644 --- a/Frameworks/DocumentWindow/src/DocumentController.mm +++ b/Frameworks/DocumentWindow/src/DocumentController.mm @@ -1000,7 +1000,7 @@ namespace } [self closeTabsAtIndexes:indexSet askToSaveChanges:YES createDocumentIfEmpty:NO]; } - else + else if(![[NSUserDefaults standardUserDefaults] boolForKey:kUserDefaultsDisableTabAutoCloseKey]) { NSInteger excessTabs = _documents.size() - std::max(self.tabBarView.countOfVisibleTabs, 8); if(self.tabBarView && excessTabs > 0) diff --git a/Frameworks/Preferences/src/Keys.h b/Frameworks/Preferences/src/Keys.h index 50c19664..cc6bc6d6 100644 --- a/Frameworks/Preferences/src/Keys.h +++ b/Frameworks/Preferences/src/Keys.h @@ -31,6 +31,7 @@ PUBLIC extern NSString* const kUserDefaultsDisableFileBrowserWindowResizeKey; PUBLIC extern NSString* const kUserDefaultsAutoRevealFileKey; PUBLIC extern NSString* const kUserDefaultsAllowExpandingLinksKey; PUBLIC extern NSString* const kUserDefaultsDisableTabReorderingKey; +PUBLIC extern NSString* const kUserDefaultsDisableTabAutoCloseKey; // =========== // = Bundles = diff --git a/Frameworks/Preferences/src/Keys.mm b/Frameworks/Preferences/src/Keys.mm index fbe05c50..7d9411e8 100644 --- a/Frameworks/Preferences/src/Keys.mm +++ b/Frameworks/Preferences/src/Keys.mm @@ -71,6 +71,7 @@ NSString* const kUserDefaultsTabsAboveDocumentKey = @"tabsAboveDocu NSString* const kUserDefaultsDisableFileBrowserWindowResizeKey = @"disableFileBrowserWindowResize"; NSString* const kUserDefaultsAutoRevealFileKey = @"autoRevealFile"; NSString* const kUserDefaultsDisableTabReorderingKey = @"disableTabReordering"; +NSString* const kUserDefaultsDisableTabAutoCloseKey = @"disableTabAutoClose"; NSString* const kUserDefaultsAllowExpandingLinksKey = @"allowExpandingLinks"; // ===========