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

fix: emit window-all-closed after closing the window (#28867)

Browse source
This commit is contained in:
Jeremy Rose 2021-04-28 10:55:08 -07:00 committed by GitHub
parent 733f81449d
commit c200840006
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
shell/browser/native_window.cc
View file

@ -423,11 +423,11 @@ void NativeWindow::NotifyWindowClosed() {
if (is_closed_) if (is_closed_)
return; return;
WindowList::RemoveWindow(this);
is_closed_ = true; is_closed_ = true;
for (NativeWindowObserver& observer : observers_) for (NativeWindowObserver& observer : observers_)
observer.OnWindowClosed(); observer.OnWindowClosed();
WindowList::RemoveWindow(this);
} }
void NativeWindow::NotifyWindowEndSession() { void NativeWindow::NotifyWindowEndSession() {

13
spec-main/api-app-spec.ts
View file

@ -1626,6 +1626,8 @@ describe('default behavior', () => {
}); });
describe('window-all-closed', () => { describe('window-all-closed', () => {
afterEach(closeAllWindows);
it('quits when the app does not handle the event', async () => { it('quits when the app does not handle the event', async () => {
const result = await runTestApp('window-all-closed'); const result = await runTestApp('window-all-closed');
expect(result).to.equal(false); expect(result).to.equal(false);
@ -1635,6 +1637,17 @@ describe('default behavior', () => {
const result = await runTestApp('window-all-closed', '--handle-event'); const result = await runTestApp('window-all-closed', '--handle-event');
expect(result).to.equal(true); expect(result).to.equal(true);
}); });
it('should omit closed windows from getAllWindows', async () => {
const w = new BrowserWindow({ show: false });
const len = new Promise(resolve => {
app.on('window-all-closed', () => {
resolve(BrowserWindow.getAllWindows().length);
});
});
w.close();
expect(await len).to.equal(0);
});
}); });
describe('user agent fallback', () => { describe('user agent fallback', () => {