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 #227 from KiranNiranjan/ELECTRON-197

Browse Source 
Electron-197 (Windows Desktop composition)
This commit is contained in:
Vikas Shashidhar 2017-11-09 15:00:36 +05:30 committed by GitHub
commit cd702ab2c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
js/desktopCapturer/getSources.js
View File

@ -12,7 +12,8 @@
// renderer process, this will have to do. See github issue posted here to // renderer process, this will have to do. See github issue posted here to
// electron: https://github.com/electron/electron/issues/9312 // electron: https://github.com/electron/electron/issues/9312
const { ipcRenderer } = require('electron'); const { ipcRenderer, remote } = require('electron');
const { isWindowsOS } = require('../utils/misc');
let nextId = 0; let nextId = 0;
let includes = [].includes; let includes = [].includes;
@ -52,6 +53,17 @@ function getSources(options, callback) {
}; };
} }
if (isWindowsOS) {
/**
* Sets the captureWindow to false if Desktop composition
* is disabled otherwise true
*
* Setting captureWindow to false returns only screen sources
* @type {boolean}
*/
captureWindow = remote.systemPreferences.isAeroGlassEnabled();
}
id = getNextId(); id = getNextId();
ipcRenderer.send('ELECTRON_BROWSER_DESKTOP_CAPTURER_GET_SOURCES', captureWindow, captureScreen, updatedOptions.thumbnailSize, id); ipcRenderer.send('ELECTRON_BROWSER_DESKTOP_CAPTURER_GET_SOURCES', captureWindow, captureScreen, updatedOptions.thumbnailSize, id);

2
js/utils/misc.js
View File

@ -4,11 +4,13 @@ const isDevEnv = process.env.ELECTRON_DEV ?
process.env.ELECTRON_DEV.trim().toLowerCase() === 'true' : false; process.env.ELECTRON_DEV.trim().toLowerCase() === 'true' : false;
const isMac = (process.platform === 'darwin'); const isMac = (process.platform === 'darwin');
const isWindowsOS = (process.platform === 'win32');
const isNodeEnv = !!process.env.NODE_ENV; const isNodeEnv = !!process.env.NODE_ENV;
module.exports = { module.exports = {
isDevEnv: isDevEnv, isDevEnv: isDevEnv,
isMac: isMac, isMac: isMac,
isWindowsOS: isWindowsOS,
isNodeEnv: isNodeEnv isNodeEnv: isNodeEnv
}; };