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

Merge remote-tracking branch 'sym/master'

Browse Source
This commit is contained in:
Vishwas Shashidhar 2020-04-15 14:44:10 +05:30
commit 2364be8ce8
2 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -164,8 +164,8 @@
"systeminformation": "4.23.0" "systeminformation": "4.23.0"
}, },
"optionalDependencies": { "optionalDependencies": {
"screen-snippet": "git+https://github.com/symphonyoss/ScreenSnippet2.git#v1.0.6", "screen-snippet": "git+https://github.com/symphonyoss/ScreenSnippet2.git#v1.0.7",
"screen-share-indicator-frame": "git+https://github.com/symphonyoss/ScreenShareIndicatorFrame.git#v1.4.4", "screen-share-indicator-frame": "git+https://github.com/symphonyoss/ScreenShareIndicatorFrame.git#v1.4.6",
"swift-search": "2.0.2" "swift-search": "2.0.2"
}, },
"ava": { "ava": {

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

@ -639,6 +639,13 @@ export class WindowHandler {
} else if (isMac && type === 'screen') { } else if (isMac && type === 'screen') {
const dispId = source.id.split(':')[1]; const dispId = source.id.split(':')[1];
this.execCmd(this.screenShareIndicatorFrameUtil, [ dispId ]); this.execCmd(this.screenShareIndicatorFrameUtil, [ dispId ]);
} else if (isWindowsOS && type === 'screen') {
logger.info('window-handler: source.display_id: ' + source.display_id);
if (source.display_id !== '') {
this.execCmd(this.screenShareIndicatorFrameUtil, [ source.display_id ]);
} else {
this.execCmd(this.screenShareIndicatorFrameUtil, [ '0' ]);
}
} }
} }
} }
@ -828,23 +835,22 @@ export class WindowHandler {
}); });
} }
logger.info('window-handler: createScreenSharingIndicatorWindow, displayId: ' + displayId);
if (displayId !== '') { if (displayId !== '') {
const displays = electron.screen.getAllDisplays(); if (isLinux) {
const displays = electron.screen.getAllDisplays();
displays.forEach((element) => { displays.forEach((element) => {
if (displayId === element.id.toString()) { logger.info('window-handler: element.id.toString(): ' + element.id.toString());
logger.info(`window-handler: element:`, element); if (displayId === element.id.toString()) {
if (isWindowsOS) { logger.info(`window-handler: element:`, element);
this.execCmd(this.screenShareIndicatorFrameUtil, [ displayId ]); this.createScreenSharingFrameWindow('screen-sharing-frame',
} else if (isLinux) { element.workArea.width,
this.createScreenSharingFrameWindow('screen-sharing-frame', element.workArea.height,
element.workArea.width, element.workArea.x,
element.workArea.height, element.workArea.y);
element.workArea.x,
element.workArea.y);
} }
} });
}); }
} }
this.screenSharingIndicatorWindow = createComponentWindow('screen-sharing-indicator', opts); this.screenSharingIndicatorWindow = createComponentWindow('screen-sharing-indicator', opts);