Skip to content

refactor(common): remove use of ipc for fullscreen mode #923

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

Draft
tymmesyde wants to merge 1 commit into
base: development
Choose a base branch
from
Draft

refactor(common): remove use of ipc for fullscreen mode #923

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 4 additions & 19 deletions src/common/useFullscreen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,21 @@
// Copyright (C) 2017-2023 Smart code 203358507

import { useCallback, useEffect, useState } from 'react';
import useShell, { type WindowVisibility } from './useShell';
import useSettings from './useSettings';

const useFullscreen = () => {
const shell = useShell();
const [settings] = useSettings();

const [fullscreen, setFullscreen] = useState(false);

const requestFullscreen = useCallback(() => {
if (shell.active) {
shell.send('win-set-visibility', { fullscreen: true });
} else {
if (document.fullscreenElement !== document.documentElement) {
document.documentElement.requestFullscreen();
}
}, []);

const exitFullscreen = useCallback(() => {
if (shell.active) {
shell.send('win-set-visibility', { fullscreen: false });
} else {
if (document.fullscreenElement === document.documentElement) {
document.exitFullscreen();
}
if (document.fullscreenElement === document.documentElement) {
document.exitFullscreen();
}
}, []);

Expand All @@ -33,10 +24,6 @@ const useFullscreen = () => {
}, [fullscreen]);

useEffect(() => {
const onWindowVisibilityChanged = (state: WindowVisibility) => {
setFullscreen(state.isFullscreen === true);
};

const onFullscreenChange = () => {
setFullscreen(document.fullscreenElement === document.documentElement);
};
Expand All @@ -50,17 +37,15 @@ const useFullscreen = () => {
toggleFullscreen();
}

if (event.code === 'F11' && shell.active) {
if (event.code === 'F11') {
toggleFullscreen();
}
};

shell.on('win-visibility-changed', onWindowVisibilityChanged);
document.addEventListener('keydown', onKeyDown);
document.addEventListener('fullscreenchange', onFullscreenChange);

return () => {
shell.off('win-visibility-changed', onWindowVisibilityChanged);
document.removeEventListener('keydown', onKeyDown);
document.removeEventListener('fullscreenchange', onFullscreenChange);
};
Expand Down