mirrors/TidGi-Desktop
1
Fork 0
mirror of https://github.com/tiddly-gittly/TidGi-Desktop.git synced 2025-12-06 02:30:47 -08:00
Code Issues Projects Releases Packages Wiki Activity

fix: no context menu on new window

Browse source
This commit is contained in:
linonetwo 2023-06-23 21:50:31 +08:00
parent f115ca1ca7
commit 07b6edf9df
2 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/services/view/handleNewWindow.ts
View file

@ -57,9 +57,9 @@ export function handleNewWindow(
action: 'deny',
};
}
logger.debug('handleNewWindow()', { newWindowContext });
const { view, workspace, sharedWebPreferences, meta } = newWindowContext;
const currentUrl = view.webContents.getURL();
logger.debug('Allowing creating new window', { newWindowContext, function: 'handleNewWindow' });
const { view: parentWindowView, workspace, sharedWebPreferences, meta } = newWindowContext;
const currentUrl = parentWindowView.webContents.getURL();
/** Conditions are listed by order of priority
if global.forceNewWindow = true
or regular new-window event
@ -115,7 +115,7 @@ export function handleNewWindow(
}
parentWebContents.once('did-create-window', (childWindow) => {
childWindow.setMenuBarVisibility(false);
childWindow.webContents.setWindowOpenHandler((details: Electron.HandlerDetails) => handleNewWindow(details, newWindowContext, parentWebContents));
childWindow.webContents.setWindowOpenHandler((details: Electron.HandlerDetails) => handleNewWindow(details, newWindowContext, childWindow.webContents));
childWindow.webContents.once('will-navigate', async (_event, url) => {
// if the window is used for the current app, then use default behavior
const appUrl = (await workspaceService.get(workspace.id))?.homeUrl;
@ -133,9 +133,11 @@ export function handleNewWindow(
});
windowWithBrowserViewState.manage(childWindow);
const menuService = container.get<IMenuService>(serviceIdentifier.MenuService);
void menuService.initContextMenuForWindowWebContents(view.webContents).then((unregisterContextMenu) => {
childWindow.webContents.on('destroyed', () => {
unregisterContextMenu();
childWindow.webContents.once('dom-ready', async () => {
await menuService.initContextMenuForWindowWebContents(childWindow.webContents).then((unregisterContextMenu) => {
childWindow.webContents.on('destroyed', () => {
unregisterContextMenu();
});
});
});
});