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

SDA-1661 - Make about app window a modal window and optimize code (#843)

Browse Source
This commit is contained in:
Kiran Niranjan 2020-01-08 17:19:06 +05:30 committed by Vishwas Shashidhar
parent a9fc026df9
commit c63a2682e3
2 changed files with 39 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/app/window-handler.ts
View File

@ -21,7 +21,8 @@ import { versionHandler } from './version-handler';
import { handlePermissionRequests, monitorWindowActions } from './window-actions';
import {
createComponentWindow,
getBounds,
didVerifyAndRestoreWindow,
getBounds, getWindowByName,
handleCertificateProxyVerification,
handleDownloadManager,
injectStyles,
@ -476,24 +477,16 @@ export class WindowHandler {
// This prevents creating multiple instances of the
// about window
if (this.aboutAppWindow && windowExists(this.aboutAppWindow)) {
if (this.aboutAppWindow.isMinimized()) {
this.aboutAppWindow.restore();
}
this.aboutAppWindow.focus();
if (didVerifyAndRestoreWindow(this.aboutAppWindow)) {
return;
}
const allWindows = BrowserWindow.getAllWindows();
const selectedParentWindow = allWindows.find((window) => {
return (window as ICustomBrowserWindow).winName === windowName;
});
const selectedParentWindow = getWindowByName(windowName);
const opts: BrowserWindowConstructorOptions = this.getWindowOpts({
width: 550,
height: isWindowsOS ? 745 : 705,
modal: false,
modal: true,
alwaysOnTop: isMac,
resizable: false,
}, {
@ -671,17 +664,10 @@ export class WindowHandler {
});
// This prevents creating multiple instances of the
// notification configuration window
if (this.notificationSettingsWindow && !this.notificationSettingsWindow.isDestroyed()) {
if (this.notificationSettingsWindow.isMinimized()) {
this.notificationSettingsWindow.restore();
}
this.notificationSettingsWindow.focus();
if (didVerifyAndRestoreWindow(this.notificationSettingsWindow)) {
return;
}
const allWindows = BrowserWindow.getAllWindows();
const selectedParentWindow = allWindows.find((window) => {
return (window as ICustomBrowserWindow).winName === windowName;
});
const selectedParentWindow = getWindowByName(windowName);
if (selectedParentWindow) {
opts.parent = selectedParentWindow;
@ -785,7 +771,7 @@ export class WindowHandler {
const winY: string = element.bounds.y.toString();
this.execCmd(this.screenShareIndicatorFrameUtil, [ winX, winY ]);
} else {
this.createScrenSharingFrameWindow('screen-sharing-frame',
this.createScreenSharingFrameWindow('screen-sharing-frame',
element.workArea.width,
element.workArea.height,
element.workArea.x,
@ -822,22 +808,15 @@ export class WindowHandler {
/**
* Creates a screen-sharing frame around the shared area
*/
public createScrenSharingFrameWindow(windowName: string, frameWidth: number, frameHeight: number, framePositionX: number, framePositionY: number): void {
public createScreenSharingFrameWindow(windowName: string, frameWidth: number, frameHeight: number, framePositionX: number, framePositionY: number): void {
// This prevents creating multiple instances of the
// about window
if (this.screenSharingFrameWindow && windowExists(this.screenSharingFrameWindow)) {
if (this.screenSharingFrameWindow.isMinimized()) {
this.screenSharingFrameWindow.restore();
}
this.screenSharingFrameWindow.focus();
if (didVerifyAndRestoreWindow(this.screenSharingFrameWindow)) {
return;
}
const allWindows = BrowserWindow.getAllWindows();
const selectedParentWindow = allWindows.find((window) => {
return (window as ICustomBrowserWindow).winName === windowName;
});
const selectedParentWindow = getWindowByName(windowName);
const opts: BrowserWindowConstructorOptions = this.getWindowOpts({
width: frameWidth,

28
src/app/window-utils.ts
View File

@ -513,3 +513,31 @@ export const reloadWindow = (browserWindow: ICustomBrowserWindow) => {
mainWindow.webContents.send('restart-floater', { windowName, bounds });
}
};
/**
* Verifies if window exists and restores/focuses the window
*
* @param browserWindow {ICustomBrowserWindow}
*/
export const didVerifyAndRestoreWindow = (browserWindow: BrowserWindow | null): boolean => {
if (!browserWindow || !windowExists(browserWindow)) {
return false;
}
if (browserWindow.isMinimized()) {
browserWindow.restore();
}
browserWindow.focus();
return true;
};
/**
* Finds and returns a specific window by name
*
* @param windowName {String}
*/
export const getWindowByName = (windowName: string): BrowserWindow | undefined => {
const allWindows = BrowserWindow.getAllWindows();
return allWindows.find((window) => {
return (window as ICustomBrowserWindow).winName === windowName;
});
};