Fixes: zulip#1077

Signed-off-by: tarun8718 <tarunkumar8718@gmail.com>
tarun8718 · Mar 2, 2021 · 9ccd1fe · 9ccd1fe
1 parent 2a0f9b3
commit 9ccd1fe
Showing 1 changed file with 30 additions and 0 deletions.
diff --git a/app/main/menu.ts b/app/main/menu.ts
@@ -344,6 +344,21 @@ function getDarwinTpl(props: MenuProps): Electron.MenuItemConstructorOptions[] {
 			accelerator: 'Cmd+,',
 			click(_item, focusedWindow) {
 				if (focusedWindow) {
+					let numberServers = 0;
+					tabs.forEach(tab => {
+						if (tab.role === 'server') {
+							numberServers++;
+						}
+					});
+					if (numberServers === 1) {
+						const value = ConfigUtil.getConfigItem('showSidebar');
+						if (!value) {
+							const newValue = !value;
+							focusedWindow.webContents.send('toggle-sidebar', newValue);
+							ConfigUtil.setConfigItem('showSidebar', newValue);
+						}
+					}
+
 					sendAction('open-settings');
 				}
 			}
@@ -476,6 +491,21 @@ function getOtherTpl(props: MenuProps): Electron.MenuItemConstructorOptions[] {
 			accelerator: 'Ctrl+,',
 			click(_item, focusedWindow) {
 				if (focusedWindow) {
+					let numberServers = 0;
+					tabs.forEach(tab => {
+						if (tab.role === 'server') {
+							numberServers++;
+						}
+					});
+					if (numberServers === 1) {
+						const value = ConfigUtil.getConfigItem('showSidebar');
+						if (!value) {
+							const newValue = !value;
+							focusedWindow.webContents.send('toggle-sidebar', newValue);
+							ConfigUtil.setConfigItem('showSidebar', newValue);
+						}
+					}
+
 					sendAction('open-settings');
 				}
 			}