diff --git a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.ts b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.ts index 0ae4b70ae4543..2c8b1c55fcac8 100644 --- a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.ts +++ b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.ts @@ -411,6 +411,7 @@ export class StickyScrollController extends Disposable implements IEditorContrib this._contextMenuService.showContextMenu({ menuId: MenuId.StickyScrollContext, getAnchor: () => event, + menuActionOptions: { renderShortTitle: true }, }); } diff --git a/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts b/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts index e254ff4dbde96..094ee8995fa4b 100644 --- a/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts +++ b/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts @@ -692,10 +692,11 @@ registerAction2(class ToggleBreadcrumb extends Action2 { super({ id: 'breadcrumbs.toggle', title: localize2('cmd.toggle', "Toggle Breadcrumbs"), + shortTitle: localize2('cmd.toggle.short', "Breadcrumbs"), category: Categories.View, toggled: { condition: ContextKeyExpr.equals('config.breadcrumbs.enabled', true), - title: localize('cmd.toggle2', "Toggle Breadcrumbs"), + title: localize('cmd.toggle2', "Breadcrumbs"), mnemonicTitle: localize({ key: 'miBreadcrumbs2', comment: ['&& denotes a mnemonic'] }, "&&Breadcrumbs") }, menu: [ diff --git a/src/vs/workbench/browser/parts/editor/editorGroupView.ts b/src/vs/workbench/browser/parts/editor/editorGroupView.ts index a1050be0194de..a2344eaf8f200 100644 --- a/src/vs/workbench/browser/parts/editor/editorGroupView.ts +++ b/src/vs/workbench/browser/parts/editor/editorGroupView.ts @@ -2099,7 +2099,7 @@ export class EditorGroupView extends Themable implements IEditorGroupView { const shouldInlineGroup = (action: SubmenuAction, group: string) => group === 'navigation' && action.actions.length <= 1; actions = getActionBarActions( - editorTitleMenu.getActions({ arg: this.resourceContext.get(), shouldForwardArgs: true }), + editorTitleMenu.getActions({ arg: this.resourceContext.get(), shouldForwardArgs: true, renderShortTitle: true }), 'navigation', shouldInlineGroup ); diff --git a/src/vs/workbench/contrib/notebook/browser/controller/layoutActions.ts b/src/vs/workbench/contrib/notebook/browser/controller/layoutActions.ts index e1bc6e7451142..167161bc10e34 100644 --- a/src/vs/workbench/contrib/notebook/browser/controller/layoutActions.ts +++ b/src/vs/workbench/contrib/notebook/browser/controller/layoutActions.ts @@ -117,6 +117,7 @@ registerAction2(class ToggleLineNumberFromEditorTitle extends Action2 { super({ id: 'notebook.toggleLineNumbersFromEditorTitle', title: localize2('notebook.toggleLineNumbers', 'Toggle Notebook Line Numbers'), + shortTitle: localize2('notebook.toggleLineNumbers.short', 'Line Numbers'), precondition: NOTEBOOK_EDITOR_FOCUSED, menu: [ { @@ -129,7 +130,7 @@ registerAction2(class ToggleLineNumberFromEditorTitle extends Action2 { f1: true, toggled: { condition: ContextKeyExpr.notEquals('config.notebook.lineNumbers', 'off'), - title: localize('notebook.showLineNumbers', "Notebook Line Numbers"), + title: localize('notebook.showLineNumbers', "Line Numbers"), } }); } @@ -164,11 +165,17 @@ registerAction2(class ToggleBreadcrumbFromEditorTitle extends Action2 { super({ id: 'breadcrumbs.toggleFromEditorTitle', title: localize2('notebook.toggleBreadcrumb', 'Toggle Breadcrumbs'), + shortTitle: localize2('notebook.toggleBreadcrumb.short', 'Breadcrumbs'), + toggled: { + condition: ContextKeyExpr.equals('config.breadcrumbs.enabled', true), + title: localize('cmd.toggle2', "Breadcrumbs") + }, menu: [{ id: MenuId.NotebookEditorLayoutConfigure, group: 'notebookLayoutDetails', order: 2 }], + category: NOTEBOOK_ACTIONS_CATEGORY, f1: false }); } @@ -251,13 +258,14 @@ registerAction2(class ToggleNotebookStickyScroll extends Action2 { id: 'notebook.action.toggleNotebookStickyScroll', title: { ...localize2('toggleStickyScroll', "Toggle Notebook Sticky Scroll"), - mnemonicTitle: localize({ key: 'mitoggleNotebookStickyScroll', comment: ['&& denotes a mnemonic'] }, "&&Toggle Notebook Sticky Scroll"), + mnemonicTitle: localize({ key: 'mitoggleNotebookStickyScroll', comment: ['&& denotes a mnemonic'] }, "&&Sticky Scroll"), }, + shortTitle: localize2('toggleStickyScroll.short', "Sticky Scroll"), category: Categories.View, toggled: { condition: ContextKeyExpr.equals('config.notebook.stickyScroll.enabled', true), - title: localize('notebookStickyScroll', "Toggle Notebook Sticky Scroll"), - mnemonicTitle: localize({ key: 'mitoggleNotebookStickyScroll', comment: ['&& denotes a mnemonic'] }, "&&Toggle Notebook Sticky Scroll"), + title: localize('notebookStickyScroll', "Sticky Scroll"), + mnemonicTitle: localize({ key: 'mitoggleNotebookStickyScroll', comment: ['&& denotes a mnemonic'] }, "&&Sticky Scroll"), }, menu: [ { id: MenuId.CommandPalette }, diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellEditorOptions.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellEditorOptions.ts index 58ae569e6e4eb..a2350b6824ab0 100644 --- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellEditorOptions.ts +++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellEditorOptions.ts @@ -198,6 +198,7 @@ registerAction2(class ToggleLineNumberAction extends Action2 { super({ id: 'notebook.toggleLineNumbers', title: localize2('notebook.toggleLineNumbers', 'Toggle Notebook Line Numbers'), + shortTitle: localize2('notebook.toggleLineNumbers.short', 'Line Numbers'), precondition: NOTEBOOK_EDITOR_FOCUSED, menu: [ { @@ -210,7 +211,7 @@ registerAction2(class ToggleLineNumberAction extends Action2 { f1: true, toggled: { condition: ContextKeyExpr.notEquals('config.notebook.lineNumbers', 'off'), - title: localize('notebook.showLineNumbers', "Notebook Line Numbers"), + title: localize('notebook.showLineNumbers', "Line Numbers"), } }); } diff --git a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorStickyScroll.ts b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorStickyScroll.ts index f186efdae0d1b..93331ab07cb90 100644 --- a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorStickyScroll.ts +++ b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorStickyScroll.ts @@ -188,7 +188,7 @@ export class NotebookStickyScroll extends Disposable { this._contextMenuService.showContextMenu({ menuId: MenuId.NotebookStickyScrollContext, getAnchor: () => event, - menuActionOptions: { shouldForwardArgs: true, arg: args }, + menuActionOptions: { shouldForwardArgs: true, arg: args, renderShortTitle: true }, }); } diff --git a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorToolbar.ts b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorToolbar.ts index 91c2ebf389f20..c01fa7525ae6c 100644 --- a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorToolbar.ts +++ b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorToolbar.ts @@ -284,6 +284,7 @@ export class NotebookEditorWorkbenchToolbar extends Disposable { this.contextMenuService.showContextMenu({ menuId: MenuId.NotebookToolbarContext, getAnchor: () => event, + menuActionOptions: { renderShortTitle: true } }); })); }