if/SymphonyElectron
1
0
Fork 0
mirror of https://github.com/finos/SymphonyElectron.git synced 2024-12-27 17:31:36 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Mattias Gustavsson 2020-04-16 12:40:31 +02:00
commit b4d82907bf
3 changed files with 24 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.run/corp.run.xml
View File

@ -1,5 +1,5 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="corp-pod-start" type="NodeJSConfigurationType" application-parameters=". --url=https://corporate.symphony.com/login/sso/initsso" path-to-node="$PROJECT_DIR$/node_modules/electron/dist/Electron.app/Contents/MacOS/Electron" working-dir="$PROJECT_DIR$">
<configuration default="false" name="corp" type="NodeJSConfigurationType" application-parameters=". --url=https://corporate.symphony.com/login/sso/initsso" path-to-node="$PROJECT_DIR$/node_modules/.bin/electron" working-dir="$PROJECT_DIR$">
<envs>
<env name="ELECTRON_DEBUGGING" value="true" />
<env name="ELECTRON_DEV" value="true" />

32
.run/demo.run.xml
View File

@ -1,37 +1,9 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="demo-start" type="NodeJSConfigurationType" application-parameters=". --url=file://$PROJECT_DIR$/src/demo/index.html" path-to-node="$PROJECT_DIR$/node_modules/electron/dist/Electron.app/Contents/MacOS/Electron" working-dir="$PROJECT_DIR$">
<configuration default="false" name="demo" type="NodeJSConfigurationType" application-parameters=". --url=file://$PROJECT_DIR$/src/demo/index.html" path-to-node="$PROJECT_DIR$/node_modules/.bin/electron" working-dir="$PROJECT_DIR$">
<envs>
<env name="ELECTRON_DEBUGGING" value="true" />
<env name="ELECTRON_DEV" value="true" />
</envs>
<method v="2">
<option name="NpmBeforeRunTask" enabled="true">
<package-json value="$PROJECT_DIR$/package.json" />
<command value="run" />
<scripts>
<script value="compile" />
</scripts>
<node-interpreter value="project" />
<envs />
</option>
<option name="NpmBeforeRunTask" enabled="true">
<package-json value="$PROJECT_DIR$/package.json" />
<command value="run" />
<scripts>
<script value="browserify-preload" />
</scripts>
<node-interpreter value="project" />
<envs />
</option>
<option name="NpmBeforeRunTask" enabled="true">
<package-json value="$PROJECT_DIR$/package.json" />
<command value="run" />
<scripts>
<script value="browserify-preload-component" />
</scripts>
<node-interpreter value="project" />
<envs />
</option>
</method>
<method v="2" />
</configuration>
</component>

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

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