From 8458f875df6190889248c68568efe66c31a792ca Mon Sep 17 00:00:00 2001
From: Benjamin Simmonds <44439583+benibenj@users.noreply.github.com>
Date: Wed, 24 Jan 2024 11:03:54 +0100
Subject: [PATCH] Custom Titlebar Menu Fix (#203300)

custom titlebar menu fix
---
 .../browser/parts/titlebar/titlebarActions.ts | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/browser/parts/titlebar/titlebarActions.ts b/src/vs/workbench/browser/parts/titlebar/titlebarActions.ts
index a528f6ab90c..1ed7b88b35a 100644
--- a/src/vs/workbench/browser/parts/titlebar/titlebarActions.ts
+++ b/src/vs/workbench/browser/parts/titlebar/titlebarActions.ts
@@ -106,8 +106,24 @@ class ToggleCustomTitleBar extends Action2 {
 			title: localize('toggle.customTitleBar', 'Custom Title Bar'),
 			toggled: TitleBarVisibleContext,
 			menu: [
-				{ id: MenuId.MenubarAppearanceMenu, order: 6, when: ContextKeyExpr.or(ContextKeyExpr.equals(TitleBarStyleContext.key, TitlebarStyle.NATIVE), IsMainWindowFullscreenContext), group: '2_workbench_layout' },
-			]
+				{
+					id: MenuId.MenubarAppearanceMenu,
+					order: 6,
+					when: ContextKeyExpr.or(
+						ContextKeyExpr.and(
+							ContextKeyExpr.equals(TitleBarStyleContext.key, TitlebarStyle.NATIVE),
+							ContextKeyExpr.and(
+								ContextKeyExpr.equals('config.workbench.layoutControl.enabled', false),
+								ContextKeyExpr.equals('config.window.commandCenter', false),
+								ContextKeyExpr.notEquals('config.workbench.editor.editorActionsLocation', 'titleBar'),
+								ContextKeyExpr.notEquals('config.workbench.activityBar.location', 'top')
+							)?.negate()
+						),
+						IsMainWindowFullscreenContext
+					),
+					group: '2_workbench_layout'
+				},
+			],
 		});
 	}