updated naming in main.js; menubar text no longer selectable

brave · Sep 15, 2016 · 37474ea · 37474ea
1 parent 680f6a9
commit 37474ea
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/js/components/main.js b/js/components/main.js
@@ -745,8 +745,8 @@ class Main extends ImmutableComponent {
     const braverySettings = siteSettings.activeSettings(activeSiteSettings, this.props.appState, appConfig)
     const loginRequiredDetail = activeFrame ? basicAuthState.getLoginRequiredDetail(this.props.appState, activeFrame.get('tabId')) : null
 
-    const menubarEnabled = isWindows
-    const menubarVisible = menubarEnabled && (!getSetting(settings.AUTO_HIDE_MENU) || this.props.windowState.getIn(['ui', 'menubar', 'isVisible']))
+    const customTitlebarEnabled = isWindows
+    const menubarVisible = customTitlebarEnabled && (!getSetting(settings.AUTO_HIDE_MENU) || this.props.windowState.getIn(['ui', 'menubar', 'isVisible']))
     const menubarTemplate = menubarVisible ? this.props.appState.getIn(['menu', 'template']) : null
     const menubarSelectedLabel = this.props.windowState.getIn(['ui', 'menubar', 'selectedLabel'])
 
@@ -853,7 +853,7 @@ class Main extends ImmutableComponent {
             </div>
           </div>
           {
-            menubarEnabled
+            customTitlebarEnabled
               ? <WindowCaptionButtons windowMaximized={this.props.windowState.getIn(['ui', 'isMaximized'])} />
               : null
           }

diff --git a/less/navigationBar.less b/less/navigationBar.less
@@ -384,6 +384,7 @@
   .menubar {
     display: inline-block;
     cursor: default;
+    -webkit-user-select: none;
 
     .menubarItem {
       color: black;