From 897febcfe03e2f4062db429a02e2ec78f5496e48 Mon Sep 17 00:00:00 2001 From: Mattias Gustavsson Date: Fri, 28 Feb 2020 08:29:21 +0100 Subject: [PATCH 1/3] Added window tracking to screen share indicator frame for Mac --- package.json | 2 +- src/app/window-handler.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 759a335d..8166995b 100644 --- a/package.json +++ b/package.json @@ -146,7 +146,7 @@ }, "optionalDependencies": { "screen-snippet": "git+https://github.com/symphonyoss/ScreenSnippet2.git#v1.0.6", - "screen-share-indicator-frame": "git+https://github.com/symphonyoss/ScreenShareIndicatorFrame.git#v1.2.0", + "screen-share-indicator-frame": "git+https://github.com/symphonyoss/ScreenShareIndicatorFrame.git#v1.3.0", "swift-search": "2.0.1" } } diff --git a/src/app/window-handler.ts b/src/app/window-handler.ts index c6e42f2b..32feebe9 100644 --- a/src/app/window-handler.ts +++ b/src/app/window-handler.ts @@ -600,7 +600,7 @@ export class WindowHandler { ipcMain.once('screen-source-selected', (_event, source) => { if (source != null) { logger.info(`window-handler: screen-source-selected`, source, id); - if (isWindowsOS) { + if (isWindowsOS || isMac) { const type = source.id.split(':')[0]; if (type === 'window') { const hwnd = source.id.split(':')[1]; From 18a49291387c01166f645aa5efc5d5a96a768274 Mon Sep 17 00:00:00 2001 From: Mattias Gustavsson Date: Fri, 28 Feb 2020 13:16:22 +0100 Subject: [PATCH 2/3] Testing another version for build --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8166995b..dbb1636d 100644 --- a/package.json +++ b/package.json @@ -146,7 +146,7 @@ }, "optionalDependencies": { "screen-snippet": "git+https://github.com/symphonyoss/ScreenSnippet2.git#v1.0.6", - "screen-share-indicator-frame": "git+https://github.com/symphonyoss/ScreenShareIndicatorFrame.git#v1.3.0", + "screen-share-indicator-frame": "https://github.com/mattias-symphony/ScreenShareIndicatorFrame.git", "swift-search": "2.0.1" } } From 675bc82ee6a74d230f10551947f9eef05b6ecded Mon Sep 17 00:00:00 2001 From: Mattias Gustavsson Date: Fri, 28 Feb 2020 14:33:54 +0100 Subject: [PATCH 3/3] Added osx min version to build script for screen share indicator frame app --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index dbb1636d..820a1369 100644 --- a/package.json +++ b/package.json @@ -146,7 +146,7 @@ }, "optionalDependencies": { "screen-snippet": "git+https://github.com/symphonyoss/ScreenSnippet2.git#v1.0.6", - "screen-share-indicator-frame": "https://github.com/mattias-symphony/ScreenShareIndicatorFrame.git", + "screen-share-indicator-frame": "git+https://github.com/symphonyoss/ScreenShareIndicatorFrame.git#v1.4.0", "swift-search": "2.0.1" } }