mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Titlebar fixes

Browse source
This commit is contained in:
Fedor Indutny 2022-07-18 17:23:34 -07:00 committed by GitHub
parent 5c2016ec40
commit dc02633d9b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
stylesheets/components/TitleBarContainer.scss
View file

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

27
ts/components/TitleBarContainer.tsx
View file

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