Skip to content

support icons in context menus #304906

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

Open
jogibear9988 wants to merge 1 commit into
base: main
Choose a base branch
from
+35 −7
Open

support icons in context menus #304906

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 35 additions & 7 deletions src/vs/base/browser/ui/menu/menu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,7 @@ export class Menu extends ActionBar {
enableMnemonics: options.enableMnemonics,
useEventAsContext: options.useEventAsContext,
keybinding: keybindingLabel,
icon: !!action.class,
};

const menuActionViewItem = new BaseMenuActionViewItem(options.context, action, menuItemOptions, this.menuStyles);
Expand Down Expand Up @@ -447,6 +448,7 @@ class BaseMenuActionViewItem extends BaseActionViewItem {
private runOnceToEnableMouseUp: RunOnceScheduler;
private label: HTMLElement | undefined;
private check: HTMLElement | undefined;
private iconElement: HTMLElement | undefined;
private mnemonic: string | undefined;
private cssClass: string;

Expand Down Expand Up @@ -546,6 +548,9 @@ class BaseMenuActionViewItem extends BaseActionViewItem {
this.check = append(this.item, $('span.menu-item-check' + ThemeIcon.asCSSSelector(Codicon.menuSelection)));
this.check.setAttribute('role', 'none');

this.iconElement = append(this.item, $('span.menu-item-icon'));
this.iconElement.setAttribute('role', 'none');

this.label = append(this.item, $('span.action-label'));

if (this.options.label && this.options.keybinding) {
Expand Down Expand Up @@ -640,18 +645,15 @@ class BaseMenuActionViewItem extends BaseActionViewItem {
}

protected override updateClass(): void {
if (this.cssClass && this.item) {
this.item.classList.remove(...this.cssClass.split(' '));
if (this.cssClass && this.iconElement) {
this.iconElement.classList.remove(...this.cssClass.split(' '));
}
if (this.options.icon && this.label) {
if (this.options.icon && this.iconElement) {
this.cssClass = this.action.class || '';
this.label.classList.add('icon');
if (this.cssClass) {
this.label.classList.add(...this.cssClass.split(' '));
this.iconElement.classList.add(...this.cssClass.split(' '));
}
this.updateEnabled();
} else if (this.label) {
this.label.classList.remove('icon');
}
}

Expand Down Expand Up @@ -717,6 +719,10 @@ class BaseMenuActionViewItem extends BaseActionViewItem {
if (this.check) {
this.check.style.color = fgColor ?? '';
}

if (this.iconElement) {
this.iconElement.style.color = fgColor ?? '';
}
}
}

Expand Down Expand Up @@ -1189,6 +1195,10 @@ ${formatRule(Codicon.menuSubmenu)}
opacity: 0.4;
}

.monaco-menu .monaco-action-bar.vertical .action-item.disabled .menu-item-icon {
opacity: 0.4;
}

.monaco-menu .monaco-action-bar.vertical .action-label:not(.separator) {
display: inline-block;
box-sizing: border-box;
Expand Down Expand Up @@ -1227,6 +1237,19 @@ ${formatRule(Codicon.menuSubmenu)}
height: 100%;
}

.monaco-menu .monaco-action-bar.vertical .menu-item-icon {
position: absolute;
width: 1em;
height: 100%;
display: flex;
align-items: center;
justify-content: center;
}

.monaco-menu .monaco-action-bar.vertical .action-menu-item.checked .menu-item-icon {
display: none;
}

.monaco-menu .monaco-action-bar.vertical .action-menu-item.checked .menu-item-check {
visibility: visible;
display: flex;
Expand Down Expand Up @@ -1288,6 +1311,11 @@ ${formatRule(Codicon.menuSubmenu)}
width: 2em;
}

.monaco-menu .monaco-action-bar.vertical .menu-item-icon {
font-size: inherit;
width: 2em;
}

.monaco-menu .monaco-action-bar.vertical .action-label.separator {
font-size: inherit;
margin: 5px 0 !important;
Expand Down
Loading