From d6c98759c534b8bb96e9d604e6ccacabc648ed27 Mon Sep 17 00:00:00 2001 From: rafael-aero Date: Wed, 13 Apr 2022 20:53:33 +0200 Subject: [PATCH] handle also get nearest point --- ElectronNET.Host/api/screen.js | 8 +++++++- ElectronNET.Host/api/screen.ts | 7 ++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ElectronNET.Host/api/screen.js b/ElectronNET.Host/api/screen.js index 0f2dc05..855ef13 100644 --- a/ElectronNET.Host/api/screen.js +++ b/ElectronNET.Host/api/screen.js @@ -38,10 +38,16 @@ module.exports = (socket) => { electronSocket.emit('screen-getAllDisplaysCompleted', display); }); socket.on('screen-getDisplayNearestPoint', (point) => { - const display = electron_1.screen.getDisplayNearestPoint(point); + let display; + try { + display = electron_1.screen.getDisplayNearestPoint(point); + } catch { + display = electron_1.screen.getPrimaryDisplay(); + } electronSocket.emit('screen-getDisplayNearestPointCompleted', display); }); socket.on('screen-getDisplayMatching', (rectangle) => { + let display; try { display = electron_1.screen.getDisplayMatching(rectangle); } catch { diff --git a/ElectronNET.Host/api/screen.ts b/ElectronNET.Host/api/screen.ts index acd9283..37854f7 100644 --- a/ElectronNET.Host/api/screen.ts +++ b/ElectronNET.Host/api/screen.ts @@ -47,7 +47,12 @@ export = (socket: Socket) => { }); socket.on('screen-getDisplayNearestPoint', (point) => { - const display = screen.getDisplayNearestPoint(point); + let display; + try { + display = screen.getDisplayNearestPoint(point); + } catch { + display = screen.getPrimaryDisplay(); + } electronSocket.emit('screen-getDisplayNearestPointCompleted', display); });