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 pull request #937 from mattias-symphony/SDA-1897

Browse Source 
fix: SDA-1897 Screen share indicator frame not showing on Mac
This commit is contained in:
mattias-symphony 2020-03-23 10:04:18 +01:00 committed by GitHub
commit 610cbaaa57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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';
@ -604,6 +604,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 ]);
}
}
}
@ -799,9 +802,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,