Skip to content

Resolve Full-Screen Exit Issue on MacOS | Issue #330 #333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ulugmer wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Resolve Full-Screen Exit Issue on MacOS | Issue #330 #333

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b8b0e1
Resolve Full-Screen Exit Issue on MacOS Application | issue #330
ulugmer Dec 21, 2023
4900c56
Return forceQuit without leaving fullscreen
ulugmer Dec 21, 2023
c270df0
Translate Comments and Resolve ESLint Issues
ulugmer Dec 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions src/electron/window.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,24 +98,22 @@ export function createWindow(url?: string) {
window.webContents.send(ElectronEvent.FULLSCREEN_CHANGE, false);
});

window.on('close', (event) => {
window.on('close', (event) => {

@Ajaxy Ajaxy Dec 21, 2023

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please make sure to pass ESLint pre-commit checks.

@ulugmer ulugmer Dec 25, 2023

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

const focusedWindow = getCurrentWindow();
if (forceQuit.isEnabled) {
app.exit(0);
return;
}

if (focusedWindow && focusedWindow.isFullScreen()) {
event.preventDefault();
focusedWindow.once('leave-full-screen', () => {
if (forceQuit.isEnabled) {
app.exit(0);
} else {
focusedWindow.close();
}
focusedWindow.close();
});
focusedWindow.setFullScreen(false);
} else if (IS_MAC_OS || (IS_WINDOWS && tray.isEnabled)) {
if (forceQuit.isEnabled) {
app.exit(0);
forceQuit.disable();
} else if (hasExtraWindows()) {
// Обычная логика закрытия

@Ajaxy Ajaxy Dec 21, 2023

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please use English for comments.

@ulugmer ulugmer Dec 25, 2023

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

if (hasExtraWindows()) {
windows.delete(window);
windowState.unmanage();
} else {
Expand Down