devsyncwrld/backspace
1
0
Fork 0
Code Issues Pull Requests Actions 26 Packages Projects Releases Wiki Activity

refactor(desktop): pass trayActions to buildAppMenuTemplate, remove appMenuActions duplication

Browse Source 
buildAppMenuTemplate's actions param is Partial<MenuActions>, so the
tray-only callbacks (onShow/onHide/onQuit) are simply ignored. Removes
the three-callback duplication between the two objects without changing
behavior. Future onChangeInstance/onCheckForUpdates/onRestartToInstall
changes only need to be made in one place.
This commit is contained in:
Jannis Braun
2026-05-03 11:49:42 +02:00
parent bb25a3ba5e
commit 56677da8ad
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/desktop/src/main.ts
+1 -12
View File
@@ -878,23 +878,12 @@ if (!gotTheLock) {
onQuit: () => requestQuit(), onQuit: () => requestQuit(),
}; };
const appMenuActions = {
onChangeInstance: () => {
clearInstanceUrl();
mainWindow?.loadFile(getPickerPath());
mainWindow?.show();
mainWindow?.focus();
},
onCheckForUpdates: () => handleRecoveryAction('check-update'),
onRestartToInstall: () => handleRecoveryAction('install-update'),
};
const applyMenusForState = (state: RecoveryState): void => { const applyMenusForState = (state: RecoveryState): void => {
if (tray) { if (tray) {
tray.setContextMenu(Menu.buildFromTemplate(buildTrayMenuTemplate(state, trayActions))); tray.setContextMenu(Menu.buildFromTemplate(buildTrayMenuTemplate(state, trayActions)));
} }
if (process.platform === 'darwin') { if (process.platform === 'darwin') {
Menu.setApplicationMenu(Menu.buildFromTemplate(buildAppMenuTemplate(app.name, state, appMenuActions))); Menu.setApplicationMenu(Menu.buildFromTemplate(buildAppMenuTemplate(app.name, state, trayActions)));
} }
// Mode-gated push to renderer (recovery.html subscribes to this). // Mode-gated push to renderer (recovery.html subscribes to this).
if (state.mode === 'recovery' && mainWindow && !mainWindow.isDestroyed()) { if (state.mode === 'recovery' && mainWindow && !mainWindow.isDestroyed()) {