Titlebar fixes

Co-authored-by: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
This commit is contained in:
automated-signal 2022-07-18 17:37:44 -07:00 committed by GitHub
parent 1d03071dbe
commit 1875ba0fd2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 13 deletions

View File

@ -58,7 +58,7 @@
}
&__content {
height: var(--window-height);
height: calc(100vh - var(--titlebar-height));
position: relative;
}
}

View File

@ -215,7 +215,7 @@ export const TitleBarContainer = (props: PropsType): JSX.Element => {
[theme, hideMenuBar]
);
if (!hasCustomTitleBar || isFullScreen) {
if (!hasCustomTitleBar) {
return <>{children}</>;
}
@ -253,22 +253,25 @@ export const TitleBarContainer = (props: PropsType): JSX.Element => {
<div
className={classNames(
'TitleBarContainer',
isWindowActive ? 'TitleBarContainer--active' : null
isWindowActive ? 'TitleBarContainer--active' : null,
isFullScreen ? 'TitleBarContainer--fullscreen' : null
)}
>
<div className="TitleBarContainer__padding" />
<div className="TitleBarContainer__content">{children}</div>
<TitleBar
className="TitleBarContainer__title"
platform="win32"
iconSrc={iconSrc}
theme={titleBarTheme}
maximized={isMaximized}
menu={maybeMenu}
onDoubleClick={titleBarDoubleClick}
hideControls
/>
{!isFullScreen ? (
<TitleBar
className="TitleBarContainer__title"
platform="win32"
iconSrc={iconSrc}
theme={titleBarTheme}
maximized={isMaximized}
menu={maybeMenu}
onDoubleClick={titleBarDoubleClick}
hideControls
/>
) : null}
</div>
);
};