WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Add dynamic tray menu update functionality #973

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
FlorianRappl merged 1 commit into from
Dec 11, 2025
Merged

Add dynamic tray menu update functionality #973

Show file tree
Hide file tree
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
24 changes: 23 additions & 1 deletion src/ElectronNET.API/API/Tray.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,11 +220,33 @@ public async Task Show(string image, MenuItem[] menuItems)
_items.Clear();
_items.AddRange(menuItems);

RegisterMenuItemClickedHandler();
}

/// <summary>
/// Sets the tray menu items.
/// </summary>
/// <remarks>Calling this method updates the context menu with the specified items. Any previously
/// set menu items will be replaced.</remarks>
/// <param name="menuItems">An array of <see cref="MenuItem"/> objects representing the menu items to display in the tray menu.
/// Cannot be null.</param>
public async Task SetMenuItems(MenuItem[] menuItems)
{
menuItems.AddMenuItemsId();
await BridgeConnector.Socket.Emit("set-contextMenu", [menuItems]).ConfigureAwait(false);
_items.Clear();
_items.AddRange(menuItems);

RegisterMenuItemClickedHandler();
}

private void RegisterMenuItemClickedHandler()
{
BridgeConnector.Socket.Off("trayMenuItemClicked");
BridgeConnector.Socket.On<string>("trayMenuItemClicked", (id) =>
{
MenuItem menuItem = _items.GetMenuItem(id);
menuItem?.Click();
menuItem?.Click?.Invoke();
});
}

Expand Down
18 changes: 13 additions & 5 deletions src/ElectronNET.Host/api/tray.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/ElectronNET.Host/api/tray.js.map
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 15 additions & 6 deletions src/ElectronNET.Host/api/tray.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,7 @@ export = (socket: Socket) => {
tray.value = new Tray(trayIcon);

if (menuItems) {
const menu = Menu.buildFromTemplate(menuItems);

addMenuItemClickConnector(menu.items, (id) => {
electronSocket.emit('trayMenuItemClicked', id);
});
tray.value.setContextMenu(menu);
applyContextMenu(menuItems);
}
});

Expand All @@ -74,6 +69,12 @@ export = (socket: Socket) => {
}
});

socket.on('set-contextMenu', (menuItems) => {
if (menuItems && tray.value) {
applyContextMenu(menuItems);
}
});

socket.on('tray-setImage', (image) => {
if (tray.value) {
tray.value.setImage(image);
Expand Down Expand Up @@ -136,6 +137,14 @@ export = (socket: Socket) => {
}
});

function applyContextMenu(menuItems) {
const menu = Menu.buildFromTemplate(menuItems);
addMenuItemClickConnector(menu.items, (id) => {
electronSocket.emit('trayMenuItemClicked', id);
});
tray.value.setContextMenu(menu);
}

function addMenuItemClickConnector(menuItems, callback) {
menuItems.forEach((item) => {
if (item.submenu && item.submenu.items.length > 0) {
Expand Down