layout - show toggled icons again for maximised panel/chat (microsoft#295189)

* layout - show toggled icons again for maximised panel/chat

* wording

* ccr

* ccr

* ccr

* ccr

Author: bpasero

src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.ts

@@ -20,7 +20,6 @@ import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
 import { SwitchCompositeViewAction } from '../compositeBarActions.js';
 
 const maximizeIcon = registerIcon('auxiliarybar-maximize', Codicon.screenFull, localize('maximizeIcon', 'Icon to maximize the secondary side bar.'));
-const restoreIcon = registerIcon('auxiliarybar-restore', Codicon.screenNormal, localize('restoreIcon', 'Icon to restore the secondary side bar.'));
 const closeIcon = registerIcon('auxiliarybar-close', Codicon.close, localize('closeIcon', 'Icon to close the secondary side bar.'));
 
 const auxiliaryBarRightIcon = registerIcon('auxiliarybar-right-layout-icon', Codicon.layoutSidebarRight, localize('toggleAuxiliaryIconRight', 'Icon to toggle the secondary side bar off in its right position.'));
@@ -224,17 +223,10 @@ class MaximizeAuxiliaryBar extends Action2 {
 		super({
 			id: MaximizeAuxiliaryBar.ID,
 			title: localize2('maximizeAuxiliaryBar', 'Maximize Secondary Side Bar'),
-			tooltip: localize('maximizeAuxiliaryBarTooltip', "Maximize Secondary Side Bar Size"),
+			tooltip: localize('maximizeAuxiliaryBarTooltip', "Maximize Secondary Side Bar"),
 			category: Categories.View,
 			f1: true,
 			precondition: AuxiliaryBarMaximizedContext.negate(),
-			icon: maximizeIcon,
-			menu: {
-				id: MenuId.AuxiliaryBarTitle,
-				group: 'navigation',
-				order: 1,
-				when: AuxiliaryBarMaximizedContext.negate()
-			}
 		});
 	}
 
@@ -254,17 +246,10 @@ class RestoreAuxiliaryBar extends Action2 {
 		super({
 			id: RestoreAuxiliaryBar.ID,
 			title: localize2('restoreAuxiliaryBar', 'Restore Secondary Side Bar'),
-			tooltip: localize('restoreAuxiliaryBarTooltip', "Restore Secondary Side Bar Size"),
+			tooltip: localize('restoreAuxiliaryBar', 'Restore Secondary Side Bar'),
 			category: Categories.View,
 			f1: true,
 			precondition: AuxiliaryBarMaximizedContext,
-			icon: restoreIcon,
-			menu: {
-				id: MenuId.AuxiliaryBarTitle,
-				group: 'navigation',
-				order: 1,
-				when: AuxiliaryBarMaximizedContext
-			},
 			keybinding: {
 				weight: KeybindingWeight.WorkbenchContrib,
 				primary: KeyMod.CtrlCmd | KeyCode.KeyW,
@@ -289,8 +274,19 @@ class ToggleMaximizedAuxiliaryBar extends Action2 {
 		super({
 			id: ToggleMaximizedAuxiliaryBar.ID,
 			title: localize2('toggleMaximizedAuxiliaryBar', 'Toggle Maximized Secondary Side Bar'),
+			tooltip: localize('maximizeAuxiliaryBarTooltip2', "Maximize Secondary Side Bar"),
 			f1: true,
-			category: Categories.View
+			category: Categories.View,
+			icon: maximizeIcon,
+			toggled: {
+				condition: AuxiliaryBarMaximizedContext,
+				tooltip: localize('restoreAuxiliaryBar', 'Restore Secondary Side Bar'),
+			},
+			menu: {
+				id: MenuId.AuxiliaryBarTitle,
+				group: 'navigation',
+				order: 1,
+			}
 		});
 	}
 

src/vs/workbench/browser/parts/panel/panelActions.ts

@@ -23,7 +23,6 @@ import { KeybindingWeight } from '../../../../platform/keybinding/common/keybind
 import { SwitchCompositeViewAction } from '../compositeBarActions.js';
 
 const maximizeIcon = registerIcon('panel-maximize', Codicon.screenFull, localize('maximizeIcon', 'Icon to maximize a panel.'));
-const restoreIcon = registerIcon('panel-restore', Codicon.screenNormal, localize('restoreIcon', 'Icon to restore a panel.'));
 const closeIcon = registerIcon('panel-close', Codicon.close, localize('closeIcon', 'Icon to close a panel.'));
 const panelIcon = registerIcon('panel-layout-icon', Codicon.layoutPanel, localize('togglePanelOffIcon', 'Icon to toggle the panel off when it is on.'));
 const panelOffIcon = registerIcon('panel-layout-icon-off', Codicon.layoutPanelOff, localize('togglePanelOnIcon', 'Icon to toggle the panel on when it is off.'));
@@ -274,18 +273,27 @@ registerAction2(class extends SwitchCompositeViewAction {
 });
 
 const panelMaximizationSupportedWhen = ContextKeyExpr.or(PanelAlignmentContext.isEqualTo('center'), ContextKeyExpr.and(PanelPositionContext.notEqualsTo('bottom'), PanelPositionContext.notEqualsTo('top')));
-const ToggleMaximizedPanelActionId = 'workbench.action.toggleMaximizedPanel';
 
 registerAction2(class extends Action2 {
 	constructor() {
 		super({
-			id: ToggleMaximizedPanelActionId,
+			id: 'workbench.action.toggleMaximizedPanel',
 			title: localize2('toggleMaximizedPanel', 'Toggle Maximized Panel'),
-			tooltip: localize('maximizePanel', "Maximize Panel Size"),
+			tooltip: localize('maximizePanel', "Maximize Panel"),
 			category: Categories.View,
 			f1: true,
 			icon: maximizeIcon,
-			precondition: panelMaximizationSupportedWhen, // the workbench grid currently prevents us from supporting panel maximization with non-center panel alignment
+			precondition: panelMaximizationSupportedWhen,
+			toggled: {
+				condition: PanelMaximizedContext,
+				tooltip: localize('minimizePanel', "Restore Panel")
+			},
+			menu: [{
+				id: MenuId.PanelTitle,
+				group: 'navigation',
+				order: 1,
+				when: panelMaximizationSupportedWhen
+			}]
 		});
 	}
 	run(accessor: ServicesAccessor) {
@@ -309,28 +317,6 @@ registerAction2(class extends Action2 {
 	}
 });
 
-MenuRegistry.appendMenuItem(MenuId.PanelTitle, {
-	command: {
-		id: ToggleMaximizedPanelActionId,
-		title: localize('maximizePanel', "Maximize Panel Size"),
-		icon: maximizeIcon
-	},
-	group: 'navigation',
-	order: 1,
-	when: ContextKeyExpr.and(panelMaximizationSupportedWhen, PanelMaximizedContext.negate())
-});
-
-MenuRegistry.appendMenuItem(MenuId.PanelTitle, {
-	command: {
-		id: ToggleMaximizedPanelActionId,
-		title: localize('minimizePanel', "Restore Panel Size"),
-		icon: restoreIcon
-	},
-	group: 'navigation',
-	order: 1,
-	when: ContextKeyExpr.and(panelMaximizationSupportedWhen, PanelMaximizedContext)
-});
-
 MenuRegistry.appendMenuItems([
 	{
 		id: MenuId.LayoutControlMenu,