Fix Command-W behavior according to tab count

* Change tab count to behave similarly whether using old or new browser * Fix occurence of shortcut adaptations: - Command-W closes the window if tab count is 0 or 1. - If tab count is greater, Command-W closes tab, Command-Option-W closes all tabs except the primary one and Command-Shift-W closes the window * Send missing notification. Issue #1664
ViennaRSS · Apr 10, 2023 · 4ffdd65 · 4ffdd65
1 parent 3909cbc
commit 4ffdd65
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/Vienna/Sources/Application/AppController.m b/Vienna/Sources/Application/AppController.m
@@ -1634,7 +1634,7 @@ -(void)selectFolder:(NSInteger)folderId
  */
 -(void)updateCloseCommands
 {
-	if (self.browser.browserTabCount == 0 || !self.mainWindow.keyWindow)
+	if (self.browser.browserTabCount <= 1 || !self.mainWindow.keyWindow)
 	{
 		closeTabItem.keyEquivalent = @"";
 		closeAllTabsItem.keyEquivalent = @"";
@@ -3627,7 +3627,7 @@ -(BOOL)validateMenuItem:(NSMenuItem *)menuItem
 	}
 	else if (theAction == @selector(previousTab:))
 	{
-		return isMainWindowVisible && self.browser.browserTabCount > 0;
+		return isMainWindowVisible && self.browser.browserTabCount > 1;
 	}
 	else if (theAction == @selector(nextTab:))
 	{

diff --git a/Vienna/Sources/Main window/TabbedBrowserViewController.swift b/Vienna/Sources/Main window/TabbedBrowserViewController.swift
@@ -310,6 +310,10 @@ extension TabbedBrowserViewController: MMTabBarViewDelegate {
     func tabView(_ tabView: NSTabView, didSelect tabViewItem: NSTabViewItem?) {
         NotificationCenter.default.post(name: NSNotification.Name(rawValue: "MA_Notify_TabChanged"), object: tabViewItem?.view)
     }
+
+    func tabViewDidChangeNumberOfTabViewItems(_ tabView: NSTabView) {
+        NotificationCenter.default.post(name: NSNotification.Name(rawValue: "MA_Notify_TabCountChanged"), object: tabView)
+    }
 }
 
 // MARK: WKUIDelegate + BrowserContextMenuDelegate

diff --git a/Vienna/Sources/Main window/WebViewBrowser.m b/Vienna/Sources/Main window/WebViewBrowser.m
@@ -210,11 +210,7 @@ -(void)closeTab:(NSTabViewItem *)tabViewItem
  */
 -(NSInteger)browserTabCount
 {
-    if (self.primaryTab) {
-        return self.tabBarControl.numberOfTabViewItems - 1;
-    } else {
-        return self.tabBarControl.numberOfTabViewItems;
-    }
+    return self.tabBarControl.numberOfTabViewItems;
 }
 
 /* showPreviousTab