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

Merge pull request #186 from KiranNiranjan/ELECTRON-118

Browse Source 
Electron-118 (Screen snippet always on top)
This commit is contained in:
Vikas Shashidhar 2017-09-11 21:32:37 +05:30 committed by GitHub
commit 5694c534b8
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
js/screenSnippet/index.js
View File

@ -10,10 +10,12 @@ const path = require('path');
const { isMac, isDevEnv } = require('../utils/misc.js'); const { isMac, isDevEnv } = require('../utils/misc.js');
const log = require('../log.js'); const log = require('../log.js');
const logLevels = require('../enums/logLevels.js'); const logLevels = require('../enums/logLevels.js');
const eventEmitter = require('.././eventEmitter');
// static ref to child process, only allow one screen snippet at time, so // static ref to child process, only allow one screen snippet at time, so
// hold ref to prev, so can kill before starting next snippet. // hold ref to prev, so can kill before starting next snippet.
let child; let child;
let isAlwaysOnTop;
/** /**
* Captures a user selected portion of the monitor and returns jpeg image * Captures a user selected portion of the monitor and returns jpeg image
@ -61,6 +63,17 @@ class ScreenSnippet {
captureUtil = path.join(execPath, 'ScreenSnippet.exe'); captureUtil = path.join(execPath, 'ScreenSnippet.exe');
} }
// Method to verify and disable always on top property
// as an issue with the ScreenSnippet.exe not being on top
// of the electron wrapper
const windows = electron.BrowserWindow.getAllWindows();
if (windows && windows.length > 0) {
isAlwaysOnTop = windows[ 0 ].isAlwaysOnTop();
if (isAlwaysOnTop) {
eventEmitter.emit('isAlwaysOnTop', false);
}
}
captureUtilArgs = [outputFileName]; captureUtilArgs = [outputFileName];
} }
@ -72,6 +85,10 @@ class ScreenSnippet {
} }
child = childProcess.execFile(captureUtil, captureUtilArgs, (error) => { child = childProcess.execFile(captureUtil, captureUtilArgs, (error) => {
// Method to reset always on top feature
if (isAlwaysOnTop) {
eventEmitter.emit('isAlwaysOnTop', true);
}
// will be called when child process exits. // will be called when child process exits.
if (error && error.killed) { if (error && error.killed) {
// processs was killed, just resolve with no data. // processs was killed, just resolve with no data.