Mirrors/responsively-app
2
0
Fork 0
mirror of https://github.com/responsively-org/responsively-app synced 2024-11-10 14:54:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed the mac bug when app can't be opened if not exiting after closing a window

Browse source
This commit is contained in:
Manoj Vivek 2023-01-16 17:38:01 +05:30
parent 738ad442d6
commit dbed1798f4
2 changed files with 99 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

167
desktop-app/src/main/devtools/index.ts
View file

@ -122,91 +122,104 @@ const disableInspector = async (
return { status: true };
};
const openDevtools = async (
_: any,
arg: OpenDevtoolsArgs
): Promise<OpenDevtoolsResult> => {
const { webviewId, dockPosition } = arg;
if (mainWindow == null) {
return { status: false };
}
devtoolsWebview = webContents.fromId(webviewId);
if (dockPosition === DOCK_POSITION.UNDOCKED) {
devtoolsWebview.openDevTools({ mode: 'detach' });
return { status: true };
}
devtoolsBrowserView = new BrowserView();
mainWindow.setBrowserView(devtoolsBrowserView);
devtoolsBrowserView.setBounds({
x: 0,
y: 0,
width: 0,
height: 0,
});
devtoolsWebview.setDevToolsWebContents(devtoolsBrowserView.webContents);
devtoolsWebview.openDevTools();
devtoolsBrowserView.webContents
.executeJavaScript(
`
(async function () {
const sleep = ms => (new Promise(resolve => setTimeout(resolve, ms)));
var retryCount = 0;
var done = false;
while(retryCount < 10 && !done) {
try {
retryCount++;
document.querySelectorAll('div[slot="insertion-point-main"]')[0].shadowRoot.querySelectorAll('.tabbed-pane-left-toolbar.toolbar')[0].style.display = 'none'
done = true
} catch(err){
await sleep(100);
}
}
})()
`
)
.catch((err) => {
// eslint-disable-next-line no-console
console.error('Error removing the native inspect button', err);
});
return { status: true };
};
const resizeDevtools = async (_: any, arg: OpenDevtoolsArgs) => {
if (devtoolsBrowserView == null) {
return;
}
const { bounds } = arg;
if (bounds == null) {
return;
}
const { x, y, width, height } = bounds;
devtoolsBrowserView.setBounds({
x,
y,
width,
height,
});
};
const closeDevTools = async () => {
if (devtoolsWebview == null) {
return;
}
devtoolsWebview.closeDevTools();
if (devtoolsBrowserView == null) {
return;
}
mainWindow?.removeBrowserView(devtoolsBrowserView);
(devtoolsBrowserView.webContents as any).destroy();
devtoolsBrowserView = undefined;
};
export const initDevtoolsHandlers = (
_mainWindow: BrowserWindow | undefined
) => {
mainWindow = _mainWindow;
ipcMain.handle(
'open-devtools',
async (_, arg: OpenDevtoolsArgs): Promise<OpenDevtoolsResult> => {
const { webviewId, dockPosition } = arg;
if (mainWindow == null) {
return { status: false };
}
devtoolsWebview = webContents.fromId(webviewId);
if (dockPosition === DOCK_POSITION.UNDOCKED) {
devtoolsWebview.openDevTools({ mode: 'detach' });
return { status: true };
}
devtoolsBrowserView = new BrowserView();
mainWindow.setBrowserView(devtoolsBrowserView);
devtoolsBrowserView.setBounds({
x: 0,
y: 0,
width: 0,
height: 0,
});
devtoolsWebview.setDevToolsWebContents(devtoolsBrowserView.webContents);
devtoolsWebview.openDevTools();
devtoolsBrowserView.webContents
.executeJavaScript(
`
(async function () {
const sleep = ms => (new Promise(resolve => setTimeout(resolve, ms)));
var retryCount = 0;
var done = false;
while(retryCount < 10 && !done) {
try {
retryCount++;
document.querySelectorAll('div[slot="insertion-point-main"]')[0].shadowRoot.querySelectorAll('.tabbed-pane-left-toolbar.toolbar')[0].style.display = 'none'
done = true
} catch(err){
await sleep(100);
}
}
})()
`
)
.catch((err) => {
// eslint-disable-next-line no-console
console.error('Error removing the native inspect button', err);
});
ipcMain.removeHandler('open-devtools');
ipcMain.handle('open-devtools', openDevtools);
return { status: true };
}
);
ipcMain.removeHandler('resize-devtools');
ipcMain.handle('resize-devtools', resizeDevtools);
ipcMain.handle('resize-devtools', async (_, arg) => {
if (devtoolsBrowserView == null) {
return;
}
const { bounds } = arg;
if (bounds == null) {
return;
}
const { x, y, width, height } = bounds;
devtoolsBrowserView.setBounds({
x,
y,
width,
height,
});
});
ipcMain.handle('close-devtools', async () => {
if (devtoolsWebview == null) {
return;
}
devtoolsWebview.closeDevTools();
if (devtoolsBrowserView == null) {
return;
}
mainWindow?.removeBrowserView(devtoolsBrowserView);
(devtoolsBrowserView.webContents as any).destroy();
devtoolsBrowserView = undefined;
});
ipcMain.removeHandler('close-devtools');
ipcMain.handle('close-devtools', closeDevTools);
ipcMain.removeHandler('enable-inspector-overlay');
ipcMain.handle('enable-inspector-overlay', enableInspector);
ipcMain.removeHandler('disable-inspector-overlay');
ipcMain.handle('disable-inspector-overlay', disableInspector);
};

10
desktop-app/src/main/web-permissions/PermissionsManager.ts
View file

@ -105,7 +105,15 @@ class PermissionsManager {
};
const PERMISSION_RESPONSE_CHANNEL = IPC_MAIN_CHANNELS.PERMISSION_RESPONSE;
if (ipcMain.listeners(PERMISSION_RESPONSE_CHANNEL).length === 0) {
ipcMain.handle(PERMISSION_RESPONSE_CHANNEL, handler);
try {
ipcMain.handle(PERMISSION_RESPONSE_CHANNEL, handler);
} catch (e) {
// eslint-disable-next-line no-console
console.error(
'Error adding listener for permission response channel',
e
);
}
}
}