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

SDA-1897 Unify screenshare indicator frame handling for window/fullscreen

Browse Source
This commit is contained in:
Mattias Gustavsson 2020-03-19 15:23:37 +01:00
parent a104af42c6
commit e94fb41e47
1 changed files with 5 additions and 4 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 { format, parse } from 'url';
import { apiName, WindowTypes } from '../common/api-interface'; 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 { i18n, LocaleType } from '../common/i18n';
import { logger } from '../common/logger'; import { logger } from '../common/logger';
import { getCommandLineArgs, getGuid } from '../common/utils'; import { getCommandLineArgs, getGuid } from '../common/utils';
@ -604,6 +604,9 @@ export class WindowHandler {
if (type === 'window') { if (type === 'window') {
const hwnd = source.id.split(':')[1]; const hwnd = source.id.split(':')[1];
this.execCmd(this.screenShareIndicatorFrameUtil, [ hwnd ]); this.execCmd(this.screenShareIndicatorFrameUtil, [ hwnd ]);
} else if (type === 'screen') {
const dispId = source.id.split(':')[1];
this.execCmd(this.screenShareIndicatorFrameUtil, [ dispId ]);
} }
} }
} }
@ -799,9 +802,7 @@ export class WindowHandler {
displays.forEach((element) => { displays.forEach((element) => {
if (displayId === element.id.toString()) { if (displayId === element.id.toString()) {
logger.info(`window-handler: element:`, element); logger.info(`window-handler: element:`, element);
if (isWindowsOS || isMac) { if (isLinux) {
this.execCmd(this.screenShareIndicatorFrameUtil, [ displayId ]);
} else {
this.createScreenSharingFrameWindow('screen-sharing-frame', this.createScreenSharingFrameWindow('screen-sharing-frame',
element.workArea.width, element.workArea.width,
element.workArea.height, element.workArea.height,