Titlebar fixes
This commit is contained in:
parent
5c2016ec40
commit
dc02633d9b
2 changed files with 16 additions and 13 deletions
|
@ -58,7 +58,7 @@
|
|||
}
|
||||
|
||||
&__content {
|
||||
height: var(--window-height);
|
||||
height: calc(100vh - var(--titlebar-height));
|
||||
position: relative;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -215,7 +215,7 @@ export const TitleBarContainer = (props: PropsType): JSX.Element => {
|
|||
[theme, hideMenuBar]
|
||||
);
|
||||
|
||||
if (!hasCustomTitleBar || isFullScreen) {
|
||||
if (!hasCustomTitleBar) {
|
||||
return <>{children}</>;
|
||||
}
|
||||
|
||||
|
@ -253,12 +253,14 @@ 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>
|
||||
|
||||
{!isFullScreen ? (
|
||||
<TitleBar
|
||||
className="TitleBarContainer__title"
|
||||
platform="win32"
|
||||
|
@ -269,6 +271,7 @@ export const TitleBarContainer = (props: PropsType): JSX.Element => {
|
|||
onDoubleClick={titleBarDoubleClick}
|
||||
hideControls
|
||||
/>
|
||||
) : null}
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue