Auto hide menu bar for Windows

Auditors: @aekeus
brave · May 13, 2016 · 176eea6 · 176eea6
1 parent efb6712
commit 176eea6
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@
 - Fix for URL bar context menu selection detection. ([#1709](https://github.com/brave/browser-laptop/issues/1709))
 - Fix for disabling extensions without a browser restart. ([#1707](https://github.com/brave/browser-laptop/issues/1707))
 - Fix zoom indicator in hamburger menu in private tabs. ([#1706](https://github.com/brave/browser-laptop/issues/1706))
+- Menu bar is now auto hidden by default unless turned on. ([#1730](https://github.com/brave/browser-laptop/issues/1730))
 
 ## [0.9.5](https://github.com/brave/browser-laptop/releases/v0.9.5dev)
 - Added spell check. ([#859](https://github.com/brave/browser-laptop/issues/859))

diff --git a/js/about/preferences.js b/js/about/preferences.js
@@ -134,7 +134,7 @@ class GeneralTab extends ImmutableComponent {
       <SettingsList dataL10nId='appearanceSettings'>
         <SettingCheckbox dataL10nId='showHomeButton' prefKey={settings.SHOW_HOME_BUTTON} settings={this.props.settings} onChangeSetting={this.props.onChangeSetting} />
         {
-          isDarwin ? null : <SettingCheckbox dataL10nId='autoHideMenuBar' prefKey={settings.AUTO_HIDE_MENU_BAR} settings={this.props.settings} onChangeSetting={this.props.onChangeSetting} />
+          isDarwin ? null : <SettingCheckbox dataL10nId='autoHideMenuBar' prefKey={settings.AUTO_HIDE_MENU} settings={this.props.settings} onChangeSetting={this.props.onChangeSetting} />
         }
       </SettingsList>
     </SettingsList>

diff --git a/js/commonMenu.js b/js/commonMenu.js
@@ -291,13 +291,13 @@ module.exports.bookmarksToolbarMenuItem = () => {
 }
 
 module.exports.autoHideMenuBarMenuItem = () => {
-  const autoHideMenuBar = getSetting(settings.AUTO_HIDE_MENU_BAR)
+  const autoHideMenuBar = getSetting(settings.AUTO_HIDE_MENU)
   return {
     label: locale.translation('autoHideMenuBar'),
     type: 'checkbox',
     checked: autoHideMenuBar,
     click: (item, focusedWindow) => {
-      appActions.changeSetting(settings.AUTO_HIDE_MENU_BAR, !autoHideMenuBar)
+      appActions.changeSetting(settings.AUTO_HIDE_MENU, !autoHideMenuBar)
     }
   }
 }

diff --git a/js/constants/appConfig.js b/js/constants/appConfig.js
@@ -7,9 +7,6 @@ const updateHost = process.env.BRAVE_UPDATE_HOST || 'https://brave-laptop-update
 const winUpdateHost = process.env.BRAVE_WIN_UPDATE_HOST || 'https://brave-download.global.ssl.fastly.net'
 const crashURL = process.env.BRAVE_CRASH_URL || 'https://laptop-updates.brave.com/1/crashes'
 
-// Windows specific configuration settings.
-const autoHideMenuBar = process.platform !== 'win32'
-
 module.exports = {
   name: 'Brave',
   contactUrl: 'mailto:[email protected]',
@@ -80,7 +77,7 @@ module.exports = {
     'general.homepage': 'https://www.brave.com',
     'general.show-home-button': false,
     'general.useragent.value': null, // Set at runtime
-    'general.autohide-menubar': autoHideMenuBar,
+    'general.autohide-menu': true,
     'search.default-search-engine': 'content/search/google.xml',
     'tabs.switch-to-new-tabs': false,
     'tabs.paint-tabs': true,

diff --git a/js/constants/settings.js b/js/constants/settings.js
@@ -9,7 +9,7 @@ const settings = {
   SHOW_HOME_BUTTON: 'general.show-home-button',
   USERAGENT: 'general.useragent.value',
   DEFAULT_DOWNLOAD_SAVE_PATH: 'general.downloads.default-save-path',
-  AUTO_HIDE_MENU_BAR: 'general.autohide-menubar',
+  AUTO_HIDE_MENU: 'general.autohide-menu',
   // Search tab
   DEFAULT_SEARCH_ENGINE: 'search.default-search-engine',
   // Tabs tab

diff --git a/js/stores/appStore.js b/js/stores/appStore.js
@@ -110,7 +110,7 @@ const createWindow = (browserOpts, defaults) => {
   browserOpts.width = browserOpts.width < minWidth ? minWidth : browserOpts.width
   browserOpts.height = browserOpts.height < minHeight ? minHeight : browserOpts.height
 
-  const autoHideMenuBarSetting = isDarwin || getSetting(settings.AUTO_HIDE_MENU_BAR)
+  const autoHideMenuBarSetting = isDarwin || getSetting(settings.AUTO_HIDE_MENU)
 
   let mainWindow = new BrowserWindow(Object.assign({
     // smaller min size for "modal" windows
@@ -247,7 +247,7 @@ const filterOutNonRecents = debounce(() => {
 
 function handleChangeSettingAction (settingKey, settingValue) {
   switch (settingKey) {
-    case settings.AUTO_HIDE_MENU_BAR:
+    case settings.AUTO_HIDE_MENU:
       BrowserWindow.getAllWindows().forEach(function (wnd) {
         wnd.setAutoHideMenuBar(settingValue)
         wnd.setMenuBarVisibility(!settingValue)