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

Merge branch 'sda-1899' of https://github.com/johankwarnmarksymphony/SymphonyElectron into sda-1899

Browse Source
This commit is contained in:
Johan Kwarnmark 2020-03-23 11:38:25 +01:00
commit e3c2a04cdc
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,7 @@ import * as path from 'path';
import { format, parse } from 'url';
import { apiName, WindowTypes } from '../common/api-interface';
import { isDevEnv, isMac, isNodeEnv, isWindowsOS } from '../common/env';
import { isDevEnv, isLinux, isMac, isNodeEnv, isWindowsOS } from '../common/env';
import { i18n, LocaleType } from '../common/i18n';
import { logger } from '../common/logger';
import { getCommandLineArgs, getGuid } from '../common/utils';
@ -612,6 +612,9 @@ export class WindowHandler {
if (type === 'window') {
const hwnd = source.id.split(':')[1];
this.execCmd(this.screenShareIndicatorFrameUtil, [ hwnd ]);
} else if (isMac && type === 'screen') {
const dispId = source.id.split(':')[1];
this.execCmd(this.screenShareIndicatorFrameUtil, [ dispId ]);
}
}
}
@ -807,9 +810,9 @@ export class WindowHandler {
displays.forEach((element) => {
if (displayId === element.id.toString()) {
logger.info(`window-handler: element:`, element);
if (isWindowsOS || isMac) {
if (isWindowsOS) {
this.execCmd(this.screenShareIndicatorFrameUtil, [ displayId ]);
} else {
} else if (isLinux) {
this.createScreenSharingFrameWindow('screen-sharing-frame',
element.workArea.width,
element.workArea.height,