Adding frame config option and removing electron remote library (#1471)

* Adding frame config option, only installing production packages and removing electron remote library * reverting the --production option as we need electron-builder
IsmaelMartinez · Nov 9, 2024 · c2bc570 · c2bc570
1 parent c797196
commit c2bc570
Show file tree

Hide file tree

Showing 8 changed files with 99 additions and 39 deletions.
diff --git a/app/config/README.md b/app/config/README.md
@@ -50,6 +50,7 @@ Here is the list of available arguments and its usage:
 | electronCLIFlags | Electron CLI flags to be added when the app starts | [] |
 | emulateWinChromiumPlatform| Use windows platform information in chromium. This is helpful if MFA app does not support Linux.| false |
 | followSystemTheme               | Boolean to determine if to follow system theme                                                                      | false               |
+| frame | Specify false to create a Frameless Window. Default is true | false |
 | incomingCallCommand             | Command to execute on an incoming call.  (string)                                                 |                       |
 | incomingCallCommandArgs         | Arguments for the incomming call command.                                                 |       []                |
 | isCustomBackgroundEnabled	   | A boolean flag to enable/disable custom background images                       | false              |

diff --git a/app/config/index.js b/app/config/index.js
@@ -118,15 +118,6 @@ function extractYargConfig(configObject, appVersion) {
 				describe: 'custom CSS styles file location',
 				type: 'string'
 			},
-			emulateWinChromiumPlatform: {
-				default: false,
-				describe: 'Use windows platform information in chromium. This is helpful if MFA app does not support Linux.'
-			},
-			followSystemTheme: {
-				default: false,
-				describe: 'Follow system theme',
-				type: 'boolean'
-			},
 			contextIsolation: {
 				default: false,
 				describe: 'Use contextIsolation on the main BrowserWindow (WIP - Disabling this will break most functionality)',
@@ -215,9 +206,23 @@ function extractYargConfig(configObject, appVersion) {
 			},
 			electronCLIFlags: {
 				default: [],
-				describe: "Electron CLI flags",
+				describe: 'Electron CLI flags',
 				type: 'array'
 			},
+			emulateWinChromiumPlatform: {
+				default: false,
+				describe: 'Use windows platform information in chromium. This is helpful if MFA app does not support Linux.'
+			},
+			followSystemTheme: {
+				default: false,
+				describe: 'Follow system theme',
+				type: 'boolean'
+			},
+			frame: {
+				default: false,
+				describe: 'Specify false to create a Frameless Window. Default is true',
+				type: 'string'
+			},
 			incomingCallCommand: {
 				default: null,
 				describe: 'Command to execute on an incoming call.',

diff --git a/app/login/index.js b/app/login/index.js
@@ -18,8 +18,6 @@ exports.loginService = function loginService(parentWindow, callback) {
 			nodeIntegration: true
 		}
 	});
-	require('@electron/remote/main').enable(win.webContents);
-
 	win.once('ready-to-show', () => {
 		win.show();
 	});

diff --git a/app/mainAppWindow/browserWindowManager.js b/app/mainAppWindow/browserWindowManager.js
@@ -29,7 +29,6 @@ class BrowserWindowManager {
 
         // Create the window
         this.window = this.createNewBrowserWindow(windowState);
-        require('@electron/remote/main').enable(this.window.webContents);
         this.assignEventHandlers();
 
         windowState.manage(this.window);
@@ -54,6 +53,7 @@ class BrowserWindowManager {
             show: false,
             autoHideMenuBar: this.config.menubar == 'auto',
             icon: this.iconChooser ? this.iconChooser.getFile() : undefined,
+            frame: config.frame,
 
             webPreferences: {
                 partition: this.config.partition,

diff --git a/app/mainAppWindow/index.js b/app/mainAppWindow/index.js
@@ -1,4 +1,3 @@
-require('@electron/remote/main').initialize();
 const { shell, app, nativeTheme, dialog, webFrameMain, Notification } = require('electron');
 const path = require('path');
 const login = require('../login');
@@ -7,8 +6,7 @@ const Menus = require('../menus');
 const { SpellCheckProvider } = require('../spellCheckProvider');
 const { execFile } = require('child_process');
 const TrayIconChooser = require('../browser/tools/trayIconChooser');
-// eslint-disable-next-line no-unused-vars
-const { AppConfiguration } = require('../appConfiguration');
+require('../appConfiguration');
 const connMgr = require('../connectionManager');
 const fs = require('fs');
 const BrowserWindowManager = require('../mainAppWindow/browserWindowManager');

diff --git a/com.github.IsmaelMartinez.teams_for_linux.appdata.xml b/com.github.IsmaelMartinez.teams_for_linux.appdata.xml
@@ -14,6 +14,14 @@
 	<url type="bugtracker">https://github.com/IsmaelMartinez/teams-for-linux/issues</url>
 	<launchable type="desktop-id">com.github.IsmaelMartinez.teams_for_linux.desktop</launchable>
 	<releases>
+		<release version="1.11.4" date="2024-11-09">
+			<description>
+				<ul>
+					<li>Allow frameless window by using the config 'frame' option</li>
+					<li>Remove unused electron remote package</li>
+				</ul>
+			</description>
+		</release>
 		<release version="1.11.3" date="2024-10-27">
 			<description>
 				<ul>