mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix: close all open sheets before closing window on macOS (#43953)

Browse source 
Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: John Beutner <beutner.john@gmail.com>
This commit is contained in:
trop[bot] 2024-09-25 13:09:40 -05:00 committed by GitHub
parent 3c7a49fdb1
commit 6c1233a7d2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
shell/browser/native_window_mac.mm
View file

@ -346,8 +346,11 @@ void NativeWindowMac::Close() {
// [window_ performClose:nil], the window won't close properly // [window_ performClose:nil], the window won't close properly
// even after the user has ended the sheet. // even after the user has ended the sheet.
// Ensure it's closed before calling [window_ performClose:nil]. // Ensure it's closed before calling [window_ performClose:nil].
if ([window_ attachedSheet]) // If multiple sheets are open, they must all be closed.
while ([window_ attachedSheet]) {
[window_ endSheet:[window_ attachedSheet]]; [window_ endSheet:[window_ attachedSheet]];
}
DCHECK_EQ([[window_ sheets] count], 0UL);
// window_ could be nil after performClose. // window_ could be nil after performClose.
bool should_notify = is_modal() && parent() && IsVisible(); bool should_notify = is_modal() && parent() && IsVisible();

8
spec/api-browser-window-spec.ts
View file

@ -116,6 +116,14 @@ describe('BrowserWindow module', () => {
await closed; await closed;
}); });
it('should work if called when multiple messageBoxes are showing', async () => {
const closed = once(w, 'closed');
dialog.showMessageBox(w, { message: 'Hello Error' });
dialog.showMessageBox(w, { message: 'Hello Error' });
w.close();
await closed;
});
it('closes window without rounded corners', async () => { it('closes window without rounded corners', async () => {
await closeWindow(w); await closeWindow(w);
w = new BrowserWindow({ show: false, frame: false, roundedCorners: false }); w = new BrowserWindow({ show: false, frame: false, roundedCorners: false });