diff --git a/.vscode/settings.json b/.vscode/settings.json index 0dafe542..45a8dfcf 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -12,7 +12,9 @@ "msteams", "nodedir", "ntlm", + "Pipewire", "pulseaudio", + "screensizes", "subdir", "submenu", "zoetrope", diff --git a/app/streamSelector/browser.js b/app/streamSelector/browser.js index e0a14cee..6549397b 100644 --- a/app/streamSelector/browser.js +++ b/app/streamSelector/browser.js @@ -3,13 +3,13 @@ window.addEventListener('DOMContentLoaded', init()); function init() { return () => { - if (process.env["XDG_SESSION_TYPE"] === "wayland") { + if (process.env['XDG_SESSION_TYPE'] === 'wayland') { //Pipewire dialog already allows user to select screen/window so request directly to avoid prompting user multiple times to select screen initRequestSource(requestSingleScreenOrWindow); } else { initRequestSource(createPreviewScreen); } - } + }; } function initRequestSource(callback) { diff --git a/app/streamSelector/index.js b/app/streamSelector/index.js index c3bca884..c99ce158 100644 --- a/app/streamSelector/index.js +++ b/app/streamSelector/index.js @@ -1,4 +1,4 @@ -const { ipcMain, BrowserView, screen } = require('electron'); +const { ipcMain, BrowserView } = require('electron'); const path = require('path'); const resolutions = [ { @@ -143,11 +143,8 @@ function resizeView(view) { function createScreenRequestHandler() { ipcMain.once('get-screensizes-request', event => { - const pdisplay = screen.getPrimaryDisplay(); - event.reply('get-screensizes-response', resolutions.slice(0, resolutions.findIndex(r => { - return r.width >= pdisplay.size.width && r.height >= pdisplay.size.height; - }) + 1).map(s => { - return Object.assign({}, s); + event.reply('get-screensizes-response', resolutions.map(resolution => { + return Object.assign({}, resolution); })); }); } diff --git a/package.json b/package.json index 82530d57..635e2f91 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "teams-for-linux", - "version": "1.0.22", + "version": "1.0.23", "main": "app/index.js", "description": "Unofficial client for Microsoft Teams for Linux", "homepage": "https://github.com/IsmaelMartinez/teams-for-linux",