title - actually fix menus (microsoft#199549)

Author: bpasero

src/vs/platform/actions/common/actions.ts

@@ -126,6 +126,7 @@ export class MenuId {
 	static readonly TestPeekTitle = new MenuId('TestPeekTitle');
 	static readonly TouchBarContext = new MenuId('TouchBarContext');
 	static readonly TitleBarContext = new MenuId('TitleBarContext');
+	static readonly TitleBarTitleContext = new MenuId('TitleBarTitleContext');
 	static readonly TunnelContext = new MenuId('TunnelContext');
 	static readonly TunnelPrivacy = new MenuId('TunnelPrivacy');
 	static readonly TunnelProtocol = new MenuId('TunnelProtocol');

src/vs/workbench/browser/actions/layoutActions.ts

@@ -759,16 +759,18 @@ if (isWindows || isLinux || isWeb) {
 	});
 
 	// Add separately to title bar context menu so we can use a different title
-	MenuRegistry.appendMenuItem(MenuId.TitleBarContext, {
-		command: {
-			id: 'workbench.action.toggleMenuBar',
-			title: localize('miMenuBarNoMnemonic', "Menu Bar"),
-			toggled: ContextKeyExpr.and(IsMacNativeContext.toNegated(), ContextKeyExpr.notEquals('config.window.menuBarVisibility', 'hidden'), ContextKeyExpr.notEquals('config.window.menuBarVisibility', 'toggle'), ContextKeyExpr.notEquals('config.window.menuBarVisibility', 'compact'))
-		},
-		group: '2_config',
-		when: IsAuxiliaryWindowFocusedContext.toNegated(),
-		order: 0
-	});
+	for (const menuId of [MenuId.TitleBarContext, MenuId.TitleBarTitleContext]) {
+		MenuRegistry.appendMenuItem(menuId, {
+			command: {
+				id: 'workbench.action.toggleMenuBar',
+				title: localize('miMenuBarNoMnemonic', "Menu Bar"),
+				toggled: ContextKeyExpr.and(IsMacNativeContext.toNegated(), ContextKeyExpr.notEquals('config.window.menuBarVisibility', 'hidden'), ContextKeyExpr.notEquals('config.window.menuBarVisibility', 'toggle'), ContextKeyExpr.notEquals('config.window.menuBarVisibility', 'compact'))
+			},
+			when: IsAuxiliaryWindowFocusedContext.toNegated(),
+			group: menuId === MenuId.TitleBarTitleContext ? '2_config' : undefined,
+			order: 0
+		});
+	}
 }
 
 // --- Reset View Locations

src/vs/workbench/browser/parts/titlebar/titlebarActions.ts

@@ -21,12 +21,19 @@ class ToggleConfigAction extends Action2 {
 			id: `toggle.${section}`,
 			title,
 			toggled: ContextKeyExpr.equals(`config.${section}`, true),
-			menu: {
-				id: MenuId.TitleBarContext,
-				when: mainWindowOnly ? IsAuxiliaryWindowFocusedContext.toNegated() : undefined,
-				order,
-				group: '2_config'
-			}
+			menu: [
+				{
+					id: MenuId.TitleBarContext,
+					when: mainWindowOnly ? IsAuxiliaryWindowFocusedContext.toNegated() : undefined,
+					order
+				},
+				{
+					id: MenuId.TitleBarTitleContext,
+					when: mainWindowOnly ? IsAuxiliaryWindowFocusedContext.toNegated() : undefined,
+					order,
+					group: '2_config'
+				}
+			]
 		});
 	}
 
@@ -56,7 +63,10 @@ registerAction2(class ToggleEditorActions extends Action2 {
 			id: `toggle.${ToggleEditorActions.settingsID}`,
 			title: localize('toggle.editorActions', 'Editor Actions'),
 			toggled: ContextKeyExpr.equals(`config.${ToggleEditorActions.settingsID}`, 'hidden').negate(),
-			menu: { id: MenuId.TitleBarContext, order: 3, when: ContextKeyExpr.equals(`config.workbench.editor.showTabs`, 'none'), group: '2_config' }
+			menu: [
+				{ id: MenuId.TitleBarContext, order: 3, when: ContextKeyExpr.equals(`config.workbench.editor.showTabs`, 'none') },
+				{ id: MenuId.TitleBarTitleContext, order: 3, when: ContextKeyExpr.equals(`config.workbench.editor.showTabs`, 'none'), group: '2_config' }
+			]
 		});
 	}
 

src/vs/workbench/browser/parts/titlebar/titlebarPart.ts

@@ -19,7 +19,7 @@ import { ThemeIcon } from 'vs/base/common/themables';
 import { TITLE_BAR_ACTIVE_BACKGROUND, TITLE_BAR_ACTIVE_FOREGROUND, TITLE_BAR_INACTIVE_FOREGROUND, TITLE_BAR_INACTIVE_BACKGROUND, TITLE_BAR_BORDER, WORKBENCH_BACKGROUND } from 'vs/workbench/common/theme';
 import { isMacintosh, isWindows, isLinux, isWeb, isNative, platformLocale } from 'vs/base/common/platform';
 import { Color } from 'vs/base/common/color';
-import { EventType, EventHelper, Dimension, append, $, addDisposableListener, prepend, reset, getWindow, getActiveWindow, getWindowId } from 'vs/base/browser/dom';
+import { EventType, EventHelper, Dimension, append, $, addDisposableListener, prepend, reset, getWindow, getActiveWindow, getWindowId, isAncestor } from 'vs/base/browser/dom';
 import { CustomMenubarControl } from 'vs/workbench/browser/parts/titlebar/menubarControl';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { Emitter, Event } from 'vs/base/common/event';
@@ -412,16 +412,35 @@ export class BrowserTitlebarPart extends Part implements ITitlebarPart {
 		this.primaryWindowControls = append(primaryControlLocation === 'left' ? this.leftContent : this.rightContent, $('div.window-controls-container.primary'));
 		append(primaryControlLocation === 'left' ? this.rightContent : this.leftContent, $('div.window-controls-container.secondary'));
 
-		// Context menu on title
-		[EventType.CONTEXT_MENU, EventType.CLICK].forEach(event => {
-			this._register(addDisposableListener(this.rootContainer, event, e => {
-				if (event === EventType.CONTEXT_MENU || (isMacintosh && e.metaKey /* https://github.com/microsoft/vscode/issues/173563 */)) {
-					EventHelper.stop(e, event === EventType.CLICK /* prevents command center from appearing */);
-
-					this.onContextMenu(e, MenuId.TitleBarContext);
+		// Context menu over title bar: depending on the OS and the location of the click this will either be
+		// the overall context menu for the entire title bar or a specific title context menu.
+		// Windows / Linux: we only support the overall context menu on the title bar
+		// macOS: we support both the overall context menu and the title context menu.
+		//        in addition, we allow Cmd+click to bring up the title context menu.
+		{
+			this._register(addDisposableListener(this.rootContainer, EventType.CONTEXT_MENU, e => {
+				EventHelper.stop(e);
+
+				let targetMenu: MenuId;
+				if (isMacintosh && e.target instanceof HTMLElement && isAncestor(e.target, this.title)) {
+					targetMenu = MenuId.TitleBarTitleContext;
+				} else {
+					targetMenu = MenuId.TitleBarContext;
 				}
-			}, event === EventType.CLICK /* prevents command center from appearing */));
-		});
+
+				this.onContextMenu(e, targetMenu);
+			}));
+
+			if (isMacintosh) {
+				this._register(addDisposableListener(this.title, EventType.CLICK, e => {
+					if (e.metaKey) {
+						EventHelper.stop(e, true /* stop bubbling to prevent command center from opening */);
+
+						this.onContextMenu(e, MenuId.TitleBarTitleContext);
+					}
+				}, true /* capture phase to prevent command center from opening */));
+			}
+		}
 
 		// Focus action
 		const that = this;

src/vs/workbench/electron-sandbox/window.ts

@@ -660,11 +660,7 @@ export class NativeWindow extends BaseWindow {
 
 			const commandId = `workbench.action.revealPathInFinder${i}`;
 			this.customTitleContextMenuDisposable.add(CommandsRegistry.registerCommand(commandId, () => this.nativeHostService.showItemInFolder(path.fsPath)));
-			this.customTitleContextMenuDisposable.add(MenuRegistry.appendMenuItem(MenuId.TitleBarContext, {
-				command: { id: commandId, title: label || posix.sep },
-				order: -i,
-				group: '1_file'
-			}));
+			this.customTitleContextMenuDisposable.add(MenuRegistry.appendMenuItem(MenuId.TitleBarTitleContext, { command: { id: commandId, title: label || posix.sep }, order: -i, group: '1_file' }));
 		}
 	}