Menubar now respects the AUTO_HIDE_MENU setting

brave · Sep 10, 2016 · bb4db62 · bb4db62
1 parent b041814
commit bb4db62
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/js/components/main.js b/js/components/main.js
@@ -722,7 +722,7 @@ class Main extends ImmutableComponent {
     const loginRequiredDetail = activeFrame ? basicAuthState.getLoginRequiredDetail(this.props.appState, activeFrame.get('tabId')) : null
 
     const menubarEnabled = isWindows
-    const menubarVisible = menubarEnabled && this.props.windowState.getIn(['ui', 'menubar', 'isVisible'])
+    const menubarVisible = menubarEnabled && (!getSetting(settings.AUTO_HIDE_MENU) || this.props.windowState.getIn(['ui', 'menubar', 'isVisible']))
     const menubarTemplate = menubarVisible ? this.props.appState.getIn(['menu', 'template']) : null
 
     const shouldAllowWindowDrag = !this.props.windowState.get('contextMenuDetail') &&

diff --git a/js/stores/windowStore.js b/js/stores/windowStore.js
@@ -777,9 +777,10 @@ const doAction = (action) => {
       }
       break
     case WindowConstants.WINDOW_TOGGLE_MENUBAR_VISIBLE:
-      // BSCTODO: ignore if always show menu is enabled
-      const currentStatus = windowState.getIn(['ui', 'menubar', 'isVisible'])
-      windowState = windowState.setIn(['ui', 'menubar', 'isVisible'], !currentStatus)
+      if (getSetting(settings.AUTO_HIDE_MENU)) {
+        const currentStatus = windowState.getIn(['ui', 'menubar', 'isVisible'])
+        windowState = windowState.setIn(['ui', 'menubar', 'isVisible'], !currentStatus)
+      }
       break
 
     default: