Merge pull request #3278 from matrix-org/t3chguy/electron_keep_alt_menu

Allow setting in electron whether or not to auto hide menu bar

src/BasePlatform.js

@@ -128,6 +128,18 @@ export default class BasePlatform {
         throw new Error("Unimplemented");
     }
 
+    supportsAutoHideMenuBar(): boolean {
+        return false;
+    }
+
+    async getAutoHideMenuBarEnabled(): boolean {
+        return false;
+    }
+
+    async setAutoHideMenuBarEnabled(enabled: boolean): void {
+        throw new Error("Unimplemented");
+    }
+
     supportsMinimizeToTray(): boolean {
         return false;
     }

src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js

@@ -1,5 +1,6 @@
 /*
 Copyright 2019 New Vector Ltd
+Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -20,8 +21,8 @@ import {SettingLevel} from "../../../../../settings/SettingsStore";
 import LabelledToggleSwitch from "../../../elements/LabelledToggleSwitch";
 import SettingsStore from "../../../../../settings/SettingsStore";
 import Field from "../../../elements/Field";
-const sdk = require("../../../../..");
+import sdk from "../../../../..";
-const PlatformPeg = require("../../../../../PlatformPeg");
+import PlatformPeg from "../../../../../PlatformPeg";
 
 export default class PreferencesUserSettingsTab extends React.Component {
     static COMPOSER_SETTINGS = [
@@ -64,6 +65,8 @@ export default class PreferencesUserSettingsTab extends React.Component {
         this.state = {
             autoLaunch: false,
             autoLaunchSupported: false,
+            alwaysShowMenuBar: true,
+            alwaysShowMenuBarSupported: false,
             minimizeToTray: true,
             minimizeToTraySupported: false,
             autocompleteDelay: SettingsStore.getValueAt(SettingLevel.DEVICE, 'autocompleteDelay').toString(10),
@@ -80,6 +83,13 @@ export default class PreferencesUserSettingsTab extends React.Component {
             autoLaunch = await platform.getAutoLaunchEnabled();
         }
 
+        const alwaysShowMenuBarSupported = await platform.supportsAutoHideMenuBar();
+        let alwaysShowMenuBar = true;
+
+        if (alwaysShowMenuBarSupported) {
+            alwaysShowMenuBar = !await platform.getAutoHideMenuBarEnabled();
+        }
+
         const minimizeToTraySupported = await platform.supportsMinimizeToTray();
         let minimizeToTray = true;
 
@@ -87,13 +97,24 @@ export default class PreferencesUserSettingsTab extends React.Component {
             minimizeToTray = await platform.getMinimizeToTrayEnabled();
         }
 
-        this.setState({autoLaunch, autoLaunchSupported, minimizeToTraySupported, minimizeToTray});
+        this.setState({
+            autoLaunch,
+            autoLaunchSupported,
+            alwaysShowMenuBarSupported,
+            alwaysShowMenuBar,
+            minimizeToTraySupported,
+            minimizeToTray,
+        });
     }
 
     _onAutoLaunchChange = (checked) => {
         PlatformPeg.get().setAutoLaunchEnabled(checked).then(() => this.setState({autoLaunch: checked}));
     };
 
+    _onAlwaysShowMenuBarChange = (checked) => {
+        PlatformPeg.get().setAutoHideMenuBarEnabled(!checked).then(() => this.setState({alwaysShowMenuBar: checked}));
+    };
+
     _onMinimizeToTrayChange = (checked) => {
         PlatformPeg.get().setMinimizeToTrayEnabled(checked).then(() => this.setState({minimizeToTray: checked}));
     };
@@ -111,16 +132,26 @@ export default class PreferencesUserSettingsTab extends React.Component {
     render() {
         let autoLaunchOption = null;
         if (this.state.autoLaunchSupported) {
-            autoLaunchOption = <LabelledToggleSwitch value={this.state.autoLaunch}
+            autoLaunchOption = <LabelledToggleSwitch
-                                                     onChange={this._onAutoLaunchChange}
+                value={this.state.autoLaunch}
-                                                     label={_t('Start automatically after system login')} />;
+                onChange={this._onAutoLaunchChange}
+                label={_t('Start automatically after system login')} />;
+        }
+
+        let autoHideMenuOption = null;
+        if (this.state.alwaysShowMenuBarSupported) {
+            autoHideMenuOption = <LabelledToggleSwitch
+                value={this.state.alwaysShowMenuBar}
+                onChange={this._onAlwaysShowMenuBarChange}
+                label={_t('Always show the window menu bar')} />;
         }
 
         let minimizeToTrayOption = null;
         if (this.state.minimizeToTraySupported) {
-            minimizeToTrayOption = <LabelledToggleSwitch value={this.state.minimizeToTray}
+            minimizeToTrayOption = <LabelledToggleSwitch
-                                                         onChange={this._onMinimizeToTrayChange}
+                value={this.state.minimizeToTray}
-                                                         label={_t('Close button should minimize window to tray')} />;
+                onChange={this._onMinimizeToTrayChange}
+                label={_t('Close button should minimize window to tray')} />;
         }
 
         return (
@@ -139,10 +170,14 @@ export default class PreferencesUserSettingsTab extends React.Component {
                     <span className="mx_SettingsTab_subheading">{_t("Advanced")}</span>
                     {this._renderGroup(PreferencesUserSettingsTab.ADVANCED_SETTINGS)}
                     {minimizeToTrayOption}
+                    {autoHideMenuOption}
                     {autoLaunchOption}
-                    <Field id={"autocompleteDelay"} label={_t('Autocomplete delay (ms)')} type='number'
+                    <Field
-                           value={this.state.autocompleteDelay}
+                        id={"autocompleteDelay"}
-                           onChange={this._onAutocompleteDelayChange} />
+                        label={_t('Autocomplete delay (ms)')}
+                        type='number'
+                        value={this.state.autocompleteDelay}
+                        onChange={this._onAutocompleteDelayChange} />
                 </div>
             </div>
         );

src/i18n/strings/en_EN.json

@@ -591,6 +591,7 @@
     "Labs": "Labs",
     "Notifications": "Notifications",
     "Start automatically after system login": "Start automatically after system login",
+    "Always show the window menu bar": "Always show the window menu bar",
     "Close button should minimize window to tray": "Close button should minimize window to tray",
     "Preferences": "Preferences",
     "Composer": "Composer",