From 37474ea9f38e0b27de28a72d56f1a37f7aad83cc Mon Sep 17 00:00:00 2001
From: Brian Clifton <brian@clifton.me>
Date: Wed, 14 Sep 2016 23:54:08 -0700
Subject: [PATCH] updated naming in main.js; menubar text no longer selectable

---
 js/components/main.js   | 6 +++---
 less/navigationBar.less | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/js/components/main.js b/js/components/main.js
index ae567de2719..9d927c13b3b 100644
--- 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
index afc106a2ead..363a6068887 100644
--- 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;