From 9a07fd1b73d9a941159f3d295cd2689a8dc57899 Mon Sep 17 00:00:00 2001 From: Alexander Zinchuk Date: Wed, 16 Aug 2023 15:27:51 +0200 Subject: [PATCH] Phone Call: Fix header overlapping with native buttons in Electron (follow-up) (#3750) --- src/components/calls/group/GroupCall.module.scss | 4 ++++ src/components/calls/group/GroupCall.tsx | 3 +++ 2 files changed, 7 insertions(+) diff --git a/src/components/calls/group/GroupCall.module.scss b/src/components/calls/group/GroupCall.module.scss index 6d0a4f1e8..c7659d90b 100644 --- a/src/components/calls/group/GroupCall.module.scss +++ b/src/components/calls/group/GroupCall.module.scss @@ -166,6 +166,10 @@ display: flex; align-items: center; padding: 0.375rem 0.875rem; + + :global(body.is-electron) .root:not(.appFullscreen) & { + padding-left: 5rem; + } } .videosHeaderLastButton { diff --git a/src/components/calls/group/GroupCall.tsx b/src/components/calls/group/GroupCall.tsx index 718f253f3..04b65108a 100644 --- a/src/components/calls/group/GroupCall.tsx +++ b/src/components/calls/group/GroupCall.tsx @@ -26,6 +26,7 @@ import useAppLayout from '../../../hooks/useAppLayout'; import useGroupCallVideoLayout from './hooks/useGroupCallVideoLayout'; import { useIntersectionObserver, useIsIntersecting } from '../../../hooks/useIntersectionObserver'; import useLastCallback from '../../../hooks/useLastCallback'; +import { useFullscreenStatus } from '../../../hooks/useFullscreen'; import Button from '../../ui/Button'; import Modal from '../../ui/Modal'; @@ -105,6 +106,7 @@ const GroupCall: FC = ({ const [isFullscreen, openFullscreen, closeFullscreen] = useFlag(); const [isSidebarOpen, openSidebar, closeSidebar] = useFlag(true); const isLandscapeLayout = Boolean(isFullscreen && isLandscape); + const isAppFullscreen = useFullscreenStatus(); const firstPresentation = useMemo(() => { return Object.values(participants).find(({ presentation }) => presentation); @@ -253,6 +255,7 @@ const GroupCall: FC = ({ className={buildClassName( styles.root, (isFullscreen || isMobile) && styles.fullscreen, + isAppFullscreen && styles.appFullscreen, isLandscapeLayout && styles.landscape, !hasVideoParticipants && styles.noVideoParticipants, !isLandscapeLayout && styles.portrait,