Skip to content

Workbench - update editor content menu design #289245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lszomoru merged 2 commits into from
Jan 20, 2026
Merged

Workbench - update editor content menu design #289245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
feccf05
Workbench - update editor content menu design
lszomoru Jan 20, 2026
19a026f
Pull request feedback
lszomoru Jan 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 27 additions & 20 deletions src/vs/editor/contrib/floatingMenu/browser/floatingMenu.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,41 +4,48 @@
*--------------------------------------------------------------------------------------------*/

.floating-menu-overlay-widget {
padding: 0px;
color: var(--vscode-button-foreground);
background-color: var(--vscode-button-background);
border-radius: 2px;
padding: 2px 4px;
color: var(--vscode-foreground);
background-color: var(--vscode-editorWidget-background);
border-radius: 6px;
border: 1px solid var(--vscode-contrastBorder);
display: flex;
align-items: center;
justify-content: center;
gap: 4px;
z-index: 10;
box-shadow: 0 2px 8px var(--vscode-widget-shadow);
overflow: hidden;

.action-item > .action-label {
padding: 5px;
font-size: 12px;
border-radius: 2px;
.actions-container {
gap: 4px;
}

.action-item > .action-label.codicon, .action-item .codicon {
color: var(--vscode-button-foreground);
.action-item > .action-label {
padding: 4px 6px;
font-size: 11px;
line-height: 14px;
border-radius: 4px;
}

.action-item > .action-label.codicon:not(.separator) {
padding-top: 6px;
padding-bottom: 6px;
color: var(--vscode-foreground);
width: 22px;
height: 22px;
padding: 0;
font-size: 16px;
line-height: 22px;
display: flex;
align-items: center;
justify-content: center;
}

.action-item:first-child > .action-label {
padding-left: 7px;
}

.action-item:last-child > .action-label {
padding-right: 7px;
.action-item.primary > .action-label {
background-color: var(--vscode-button-background);
color: var(--vscode-button-foreground);
}

.action-item .action-label.separator {
background-color: var(--vscode-button-separator);
.action-item.primary > .action-label:hover {
background-color: var(--vscode-button-hoverBackground) !important;
Comment thread
lszomoru marked this conversation as resolved.
}
}
55 changes: 44 additions & 11 deletions src/vs/editor/contrib/floatingMenu/browser/floatingMenu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import { h } from '../../../../base/browser/dom.js';
import { Disposable } from '../../../../base/common/lifecycle.js';
import { autorun, constObservable, observableFromEvent } from '../../../../base/common/observable.js';
import { autorun, constObservable, derived, observableFromEvent } from '../../../../base/common/observable.js';
import { MenuEntryActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
import { HiddenItemStrategy, MenuWorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
import { IMenuService, MenuId, MenuItemAction } from '../../../../platform/actions/common/actions.js';
Expand All @@ -29,19 +29,43 @@ export class FloatingEditorToolbar extends Disposable implements IEditorContribu
const editorObs = this._register(observableCodeEditor(editor));

const menu = this._register(menuService.createMenu(MenuId.EditorContent, editor.contextKeyService));
const menuIsEmptyObs = observableFromEvent(this, menu.onDidChange, () => menu.getActions().length === 0);
const menuActionsObs = observableFromEvent(this, menu.onDidChange, () => menu.getActions());
const menuPrimaryActionIdObs = derived(reader => {
const menuActions = menuActionsObs.read(reader);
if (menuActions.length === 0) {
return undefined;
}

// Navigation group
const navigationGroup = menuActions
.find((group) => group[0] === 'navigation');

// First action in navigation group
if (navigationGroup && navigationGroup[1].length > 0) {
return navigationGroup[1][0].id;
}

// Fallback to first group/action
for (const [, actions] of menuActions) {
if (actions.length > 0) {
return actions[0].id;
}
}

return undefined;
});

this._register(autorun(reader => {
const menuIsEmpty = menuIsEmptyObs.read(reader);
if (menuIsEmpty) {
const menuPrimaryActionId = menuPrimaryActionIdObs.read(reader);
if (!menuPrimaryActionId) {
return;
}

const container = h('div.floating-menu-overlay-widget');

// Set height explicitly to ensure that the floating menu element
// is rendered in the lower right corner at the correct position.
container.root.style.height = '28px';
container.root.style.height = '26px';

// Toolbar
const toolbar = instantiationService.createInstance(MenuWorkbenchToolBar, container.root, MenuId.EditorContent, {
Expand All @@ -50,15 +74,24 @@ export class FloatingEditorToolbar extends Disposable implements IEditorContribu
return undefined;
}

const keybinding = keybindingService.lookupKeybinding(action.id);
if (!keybinding) {
return undefined;
}

return instantiationService.createInstance(class extends MenuEntryActionViewItem {
override render(container: HTMLElement): void {
super.render(container);

// Highlight primary action
if (action.id === menuPrimaryActionId) {
this.element?.classList.add('primary');
}
}

protected override updateLabel(): void {
const keybinding = keybindingService.lookupKeybinding(action.id);
const keybindingLabel = keybinding ? keybinding.getLabel() : undefined;

if (this.options.label && this.label) {
this.label.textContent = `${this._commandAction.label} (${keybinding.getLabel()})`;
this.label.textContent = keybindingLabel
? `${this._commandAction.label} (${keybindingLabel})`
: this._commandAction.label;
}
}
}, action, { ...options, keybindingNotRenderedWithLabel: true });
Expand Down
Loading