mirror of https://github.com/vector-im/riot-web
Allow setting in electron whether or not to auto hide menu bar
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>pull/21833/head
parent
f80cbebb9d
commit
1e9881dd7d
|
@ -128,6 +128,18 @@ export default class BasePlatform {
|
||||||
throw new Error("Unimplemented");
|
throw new Error("Unimplemented");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
supportsAutoHideMenuBar(): boolean {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
async getAutoHideMenuBarEnabled(): boolean {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
async setAutoHideMenuBarEnabled(enabled: boolean): void {
|
||||||
|
throw new Error("Unimplemented");
|
||||||
|
}
|
||||||
|
|
||||||
supportsMinimizeToTray(): boolean {
|
supportsMinimizeToTray(): boolean {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -64,6 +64,8 @@ export default class PreferencesUserSettingsTab extends React.Component {
|
||||||
this.state = {
|
this.state = {
|
||||||
autoLaunch: false,
|
autoLaunch: false,
|
||||||
autoLaunchSupported: false,
|
autoLaunchSupported: false,
|
||||||
|
alwaysShowMenuBar: true,
|
||||||
|
alwaysShowMenuBarSupported: false,
|
||||||
minimizeToTray: true,
|
minimizeToTray: true,
|
||||||
minimizeToTraySupported: false,
|
minimizeToTraySupported: false,
|
||||||
autocompleteDelay: SettingsStore.getValueAt(SettingLevel.DEVICE, 'autocompleteDelay').toString(10),
|
autocompleteDelay: SettingsStore.getValueAt(SettingLevel.DEVICE, 'autocompleteDelay').toString(10),
|
||||||
|
@ -80,6 +82,13 @@ export default class PreferencesUserSettingsTab extends React.Component {
|
||||||
autoLaunch = await platform.getAutoLaunchEnabled();
|
autoLaunch = await platform.getAutoLaunchEnabled();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const alwaysShowMenuBarSupported = await platform.supportsAutoHideMenuBar();
|
||||||
|
let alwaysShowMenuBar = true;
|
||||||
|
|
||||||
|
if (alwaysShowMenuBarSupported) {
|
||||||
|
alwaysShowMenuBar = !await platform.getAutoHideMenuBarEnabled();
|
||||||
|
}
|
||||||
|
|
||||||
const minimizeToTraySupported = await platform.supportsMinimizeToTray();
|
const minimizeToTraySupported = await platform.supportsMinimizeToTray();
|
||||||
let minimizeToTray = true;
|
let minimizeToTray = true;
|
||||||
|
|
||||||
|
@ -87,13 +96,24 @@ export default class PreferencesUserSettingsTab extends React.Component {
|
||||||
minimizeToTray = await platform.getMinimizeToTrayEnabled();
|
minimizeToTray = await platform.getMinimizeToTrayEnabled();
|
||||||
}
|
}
|
||||||
|
|
||||||
this.setState({autoLaunch, autoLaunchSupported, minimizeToTraySupported, minimizeToTray});
|
this.setState({
|
||||||
|
autoLaunch,
|
||||||
|
autoLaunchSupported,
|
||||||
|
alwaysShowMenuBarSupported,
|
||||||
|
alwaysShowMenuBar,
|
||||||
|
minimizeToTraySupported,
|
||||||
|
minimizeToTray,
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
_onAutoLaunchChange = (checked) => {
|
_onAutoLaunchChange = (checked) => {
|
||||||
PlatformPeg.get().setAutoLaunchEnabled(checked).then(() => this.setState({autoLaunch: checked}));
|
PlatformPeg.get().setAutoLaunchEnabled(checked).then(() => this.setState({autoLaunch: checked}));
|
||||||
};
|
};
|
||||||
|
|
||||||
|
_onAlwaysShowMenuBarChange = (checked) => {
|
||||||
|
PlatformPeg.get().setAutoHideMenuBarEnabled(!checked).then(() => this.setState({alwaysShowMenuBar: checked}));
|
||||||
|
};
|
||||||
|
|
||||||
_onMinimizeToTrayChange = (checked) => {
|
_onMinimizeToTrayChange = (checked) => {
|
||||||
PlatformPeg.get().setMinimizeToTrayEnabled(checked).then(() => this.setState({minimizeToTray: checked}));
|
PlatformPeg.get().setMinimizeToTrayEnabled(checked).then(() => this.setState({minimizeToTray: checked}));
|
||||||
};
|
};
|
||||||
|
@ -116,6 +136,13 @@ export default class PreferencesUserSettingsTab extends React.Component {
|
||||||
label={_t('Start automatically after system login')} />;
|
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;
|
let minimizeToTrayOption = null;
|
||||||
if (this.state.minimizeToTraySupported) {
|
if (this.state.minimizeToTraySupported) {
|
||||||
minimizeToTrayOption = <LabelledToggleSwitch value={this.state.minimizeToTray}
|
minimizeToTrayOption = <LabelledToggleSwitch value={this.state.minimizeToTray}
|
||||||
|
@ -139,6 +166,7 @@ export default class PreferencesUserSettingsTab extends React.Component {
|
||||||
<span className="mx_SettingsTab_subheading">{_t("Advanced")}</span>
|
<span className="mx_SettingsTab_subheading">{_t("Advanced")}</span>
|
||||||
{this._renderGroup(PreferencesUserSettingsTab.ADVANCED_SETTINGS)}
|
{this._renderGroup(PreferencesUserSettingsTab.ADVANCED_SETTINGS)}
|
||||||
{minimizeToTrayOption}
|
{minimizeToTrayOption}
|
||||||
|
{autoHideMenuOption}
|
||||||
{autoLaunchOption}
|
{autoLaunchOption}
|
||||||
<Field id={"autocompleteDelay"} label={_t('Autocomplete delay (ms)')} type='number'
|
<Field id={"autocompleteDelay"} label={_t('Autocomplete delay (ms)')} type='number'
|
||||||
value={this.state.autocompleteDelay}
|
value={this.state.autocompleteDelay}
|
||||||
|
|
|
@ -591,6 +591,7 @@
|
||||||
"Labs": "Labs",
|
"Labs": "Labs",
|
||||||
"Notifications": "Notifications",
|
"Notifications": "Notifications",
|
||||||
"Start automatically after system login": "Start automatically after system login",
|
"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",
|
"Close button should minimize window to tray": "Close button should minimize window to tray",
|
||||||
"Preferences": "Preferences",
|
"Preferences": "Preferences",
|
||||||
"Composer": "Composer",
|
"Composer": "Composer",
|
||||||
|
|
Loading…
Reference in New Issue