if/SymphonyElectron
1
0
Fork 0
mirror of https://github.com/finos/SymphonyElectron.git synced 2024-12-29 02:11:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:symphonyoss/SymphonyElectron

Browse Source
This commit is contained in:
Vishwas Shashidhar 2020-05-14 10:14:26 +05:30
commit b12452ffc4
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -163,7 +163,7 @@
}, },
"optionalDependencies": { "optionalDependencies": {
"screen-snippet": "git+https://github.com/symphonyoss/ScreenSnippet2.git#v1.0.8", "screen-snippet": "git+https://github.com/symphonyoss/ScreenSnippet2.git#v1.0.8",
"screen-share-indicator-frame": "git+https://github.com/symphonyoss/ScreenShareIndicatorFrame.git#v1.4.7", "screen-share-indicator-frame": "git+https://github.com/symphonyoss/ScreenShareIndicatorFrame.git#v1.4.8",
"swift-search": "2.0.2" "swift-search": "2.0.2"
}, },
"ava": { "ava": {

10
src/renderer/components/windows-title-bar.tsx
View File

@ -257,6 +257,7 @@ export default class WindowsTitleBar extends React.Component<{}, IState> {
private updateTitleBar(): void { private updateTitleBar(): void {
const { isFullScreen, titleBarHeight } = this.state; const { isFullScreen, titleBarHeight } = this.state;
const contentWrapper = document.getElementById('content-wrapper'); const contentWrapper = document.getElementById('content-wrapper');
const appView = document.getElementsByClassName('AppView-root-3')[0] as HTMLElement;
const root = document.getElementById('root'); const root = document.getElementById('root');
const railContainer = document.getElementsByClassName('ReactRail-container-2')[0] as HTMLElement; const railContainer = document.getElementsByClassName('ReactRail-container-2')[0] as HTMLElement;
const railList = document.getElementsByClassName('railList')[0] as HTMLElement; const railList = document.getElementsByClassName('railList')[0] as HTMLElement;
@ -271,10 +272,19 @@ export default class WindowsTitleBar extends React.Component<{}, IState> {
} }
if (root) { if (root) {
const rootChild = root.firstElementChild as HTMLElement;
if (rootChild && rootChild.style && rootChild.style.height === '100vh') {
rootChild.style.height = isFullScreen ? '100vh' : `calc(100vh - ${titleBarHeight})`;
}
root.style.height = isFullScreen ? '100vh' : `calc(100vh - ${titleBarHeight})`;
root.style.marginTop = isFullScreen ? '0px' : titleBarHeight; root.style.marginTop = isFullScreen ? '0px' : titleBarHeight;
} else if (contentWrapper) { } else if (contentWrapper) {
contentWrapper.style.marginTop = isFullScreen ? '0px' : titleBarHeight; contentWrapper.style.marginTop = isFullScreen ? '0px' : titleBarHeight;
} }
if (appView) {
appView.style.height = isFullScreen ? '100vh' : `calc(100vh - ${titleBarHeight})`;
}
if (isFullScreen) { if (isFullScreen) {
document.body.style.removeProperty('margin-top'); document.body.style.removeProperty('margin-top');
} }