Skip to content

🚧 Remove macOS Electron system tray in favor of remoteit-tray #1128

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

Draft
JamieRuderman wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

🚧 Remove macOS Electron system tray in favor of remoteit-tray #1128

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: 16 additions & 8 deletions electron/src/ElectronApp.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,18 +341,24 @@ export default class ElectronApp {
}

private createSystemTray() {
Logger.info('CREATE SYSTEM TRAY')
// On macOS the menu-bar tray is now provided by the standalone `remoteit-tray`
// app (cli-source), so it lives with the agent and survives this app quitting.
// Other platforms keep the Electron tray until remoteit-tray supports them.
if (environment.isMac) {
Logger.info('SYSTEM TRAY: macOS uses standalone remoteit-tray; skipping Electron tray')
} else {
Logger.info('CREATE SYSTEM TRAY')
this.tray = new electron.Tray(this.getIconPath())
new TrayMenu(this.tray)
if (environment.isWindows) {
electron.nativeTheme.on('updated', () => this.tray?.setImage(this.getIconPath()))
}
}

this.tray = new electron.Tray(this.getIconPath())
new TrayMenu(this.tray)
const defaultMenu = Menu.getApplicationMenu()
const items = defaultMenu?.items.filter(item => item.role !== 'help')
const menu = Menu.buildFromTemplate(items || [])
Menu.setApplicationMenu(menu)

if (environment.isWindows) {
electron.nativeTheme.on('updated', () => this.tray?.setImage(this.getIconPath()))
}
}

private getIconPath() {
Expand All @@ -375,7 +381,9 @@ export default class ElectronApp {
}

private openWindow = (location?: string, openDevTools?: boolean) => {
if (!this.window || !this.tray) return
// No longer gate on this.tray: on macOS the Electron tray is not created
// (see createSystemTray). The window is driven by activate/open-url handlers.
if (!this.window) return

if (!this.window.isVisible()) {
if (this.app.dock) this.app.dock.show()
Expand Down
Loading