From d6ba2d7a0aeb0bc09c590f58660e845c8e9d43c3 Mon Sep 17 00:00:00 2001 From: Kiran Niranjan Date: Thu, 7 Nov 2019 14:09:01 +0530 Subject: [PATCH 1/3] SDA-1510 - Add margin top dynamically in mana (#801) --- src/renderer/components/windows-title-bar.tsx | 22 +++++++++++++++++-- src/renderer/styles/title-bar.less | 8 +++---- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/src/renderer/components/windows-title-bar.tsx b/src/renderer/components/windows-title-bar.tsx index 4abd70cc..b890f581 100644 --- a/src/renderer/components/windows-title-bar.tsx +++ b/src/renderer/components/windows-title-bar.tsx @@ -52,6 +52,10 @@ export default class WindowsTitleBar extends React.Component<{}, IState> { if (target) { this.observer.observe(target, { attributes: true, childList: true, subtree: true, characterData: true }); } + + setTimeout(() => { + this.updateTitleBar(); + }, 10000); } public componentWillUnmount(): void { @@ -247,15 +251,29 @@ export default class WindowsTitleBar extends React.Component<{}, IState> { private updateTitleBar(): void { const { isFullScreen, titleBarHeight } = this.state; const contentWrapper = document.getElementById('content-wrapper'); - if (!contentWrapper) { + const root = document.getElementById('root'); + const railContainer = document.getElementsByClassName('ReactRail-container-2')[0] as HTMLElement; + const railList = document.getElementsByClassName('railList')[0] as HTMLElement; + if (railContainer) { + railContainer.style.height = isFullScreen ? '100vh' : `calc(100vh - ${titleBarHeight})`; + } else if (railList) { + railList.style.height = isFullScreen ? '100vh' : `calc(100vh - ${titleBarHeight})`; + } + if (!contentWrapper && !root) { document.body.style.marginTop = isFullScreen ? '0px' : titleBarHeight; return; } - contentWrapper.style.marginTop = isFullScreen ? '0px' : titleBarHeight; + if (root) { + root.style.marginTop = isFullScreen ? '0px' : titleBarHeight; + } else if (contentWrapper) { + contentWrapper.style.marginTop = isFullScreen ? '0px' : titleBarHeight; + } if (isFullScreen) { document.body.style.removeProperty('margin-top'); } + + document.body.classList.add('sda-title-bar'); } /** diff --git a/src/renderer/styles/title-bar.less b/src/renderer/styles/title-bar.less index e0d9c690..81288141 100644 --- a/src/renderer/styles/title-bar.less +++ b/src/renderer/styles/title-bar.less @@ -112,9 +112,7 @@ bottom: 0; } -body { - sda-title-bar { - display: flex; - flex-direction: row; - } +.sda-title-bar { + display: flex; + flex-direction: row; } From 228ff9ad7fe836278b28da5a0b127f25cad77efe Mon Sep 17 00:00:00 2001 From: Kiran Niranjan Date: Mon, 11 Nov 2019 18:12:44 +0530 Subject: [PATCH 2/3] SDA-1581 - Set document title for all the window (#803) --- src/renderer/preload-component.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/renderer/preload-component.ts b/src/renderer/preload-component.ts index 851017a7..cb62c0f9 100644 --- a/src/renderer/preload-component.ts +++ b/src/renderer/preload-component.ts @@ -43,21 +43,26 @@ const load = () => { break; case components.screenPicker: loadStyle(components.screenPicker); + document.title = 'Screen Picker - Symphony'; component = ScreenPicker; break; case components.screenSharingIndicator: loadStyle(components.screenSharingIndicator); + document.title = 'Screen Sharing Indicator - Symphony'; component = ScreenSharingIndicator; break; case components.basicAuth: loadStyle(components.basicAuth); + document.title = 'Basic Authentication - Symphony'; component = BasicAuth; break; case components.notification: loadStyle(components.notification); + document.title = 'Notification - Symphony'; component = NotificationComp; break; case components.notificationSettings: + document.title = 'Notification Settings - Symphony'; loadStyle(components.notificationSettings); component = NotificationSettings; break; From d64dba88538417e10fa5a84464507a9c5b710ae9 Mon Sep 17 00:00:00 2001 From: Kiran Niranjan Date: Mon, 11 Nov 2019 18:13:09 +0530 Subject: [PATCH 3/3] SDA-1582 - Include missing .node files in aip (#804) --- installer/win/Symphony-x64.aip | 31 +++++++++++++++++++++++++++++-- installer/win/Symphony-x86.aip | 31 +++++++++++++++++++++++++++++-- 2 files changed, 58 insertions(+), 4 deletions(-) diff --git a/installer/win/Symphony-x64.aip b/installer/win/Symphony-x64.aip index 351acaff..7c341cee 100644 --- a/installer/win/Symphony-x64.aip +++ b/installer/win/Symphony-x64.aip @@ -73,20 +73,31 @@ + + + + + + + + + + + @@ -95,6 +106,7 @@ + @@ -102,6 +114,9 @@ + + + @@ -121,13 +136,18 @@ + + + + + @@ -138,13 +158,14 @@ + - + @@ -164,6 +185,7 @@ + @@ -171,12 +193,14 @@ - + + + @@ -190,6 +214,8 @@ + + @@ -228,6 +254,7 @@ + diff --git a/installer/win/Symphony-x86.aip b/installer/win/Symphony-x86.aip index 67701ac2..36e061b4 100644 --- a/installer/win/Symphony-x86.aip +++ b/installer/win/Symphony-x86.aip @@ -70,22 +70,33 @@ + + + + + + + + + + + @@ -94,13 +105,17 @@ + + + + @@ -120,13 +135,18 @@ + + + + + @@ -137,13 +157,14 @@ + - + @@ -163,6 +184,7 @@ + @@ -170,12 +192,14 @@ - + + + @@ -189,6 +213,8 @@ + + @@ -227,6 +253,7 @@ +