- Custom titlebar is now toggle-able (requires restart)

- Fixed issue where menu text could be selected
brave · Sep 13, 2016 · d1d1e6c · d1d1e6c
1 parent 55ae038
commit d1d1e6c
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 5 deletions.
diff --git a/app/extensions/brave/locales/en-US/preferences.properties b/app/extensions/brave/locales/en-US/preferences.properties
@@ -192,6 +192,7 @@ flashAllowAlways=Allow until {{time}}
 alwaysAllow=Always allow
 alwaysDeny=Always deny
 appearanceSettings=Appearance Settings
+disableCustomTitlebar=Disable custom titlebar (requires browser restart)
 autoHideMenuBar=Hide the menu bar by default
 disableTitleMode=Always show the URL bar
 tabsSettings=Tabs Settings

diff --git a/app/locale.js b/app/locale.js
@@ -156,6 +156,7 @@ var rendererIdentifiers = function () {
     'lookupSelection',
     // Other identifiers
     'urlCopied',
+    'disableCustomTitlebar',
     'autoHideMenuBar',
     'unexpectedErrorWindowReload',
     'updateChannel',

diff --git a/js/about/preferences.js b/js/about/preferences.js
@@ -549,6 +549,9 @@ class GeneralTab extends ImmutableComponent {
       <div className='sectionTitle' data-l10n-id='appearanceSettings' />
       <SettingsList>
         <SettingCheckbox dataL10nId='showHomeButton' prefKey={settings.SHOW_HOME_BUTTON} settings={this.props.settings} onChangeSetting={this.props.onChangeSetting} />
+        {
+          isWindows ? <SettingCheckbox dataL10nId='disableCustomTitlebar' prefKey={settings.DISABLE_CUSTOM_TITLEBAR} settings={this.props.settings} onChangeSetting={this.props.onChangeSetting} /> : null
+        }
         {
           isDarwin ? null : <SettingCheckbox dataL10nId='autoHideMenuBar' prefKey={settings.AUTO_HIDE_MENU} settings={this.props.settings} onChangeSetting={this.props.onChangeSetting} />
         }
@@ -1337,7 +1340,8 @@ class AboutPreferences extends React.Component {
     })
     aboutActions.changeSetting(key, value)
     if (key === settings.DO_NOT_TRACK || key === settings.HARDWARE_ACCELERATION_ENABLED ||
-      key === settings.PDFJS_ENABLED || key === settings.SMOOTH_SCROLL_ENABLED) {
+      key === settings.PDFJS_ENABLED || key === settings.SMOOTH_SCROLL_ENABLED ||
+      key === settings.DISABLE_CUSTOM_TITLEBAR) {
       ipc.send(messages.PREFS_RESTART, key, value)
     }
     if (key === settings.PAYMENTS_ENABLED) {

diff --git a/js/components/main.js b/js/components/main.js
@@ -749,8 +749,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 && !getSetting(settings.DISABLE_CUSTOM_TITLEBAR)
+    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'])
 
@@ -856,7 +856,7 @@ class Main extends ImmutableComponent {
             </div>
           </div>
           {
-            menubarEnabled
+            customTitlebarEnabled
               ? <WindowCaptionButtons windowMaximized={this.props.windowState.getIn(['ui', 'isMaximized'])} />
               : null
           }

diff --git a/js/constants/appConfig.js b/js/constants/appConfig.js
@@ -86,6 +86,7 @@ module.exports = {
     'general.show-home-button': false,
     'general.useragent.value': null, // Set at runtime
     'general.autohide-menu': true,
+    'general.disable-custom-titlebar': false,
     'search.default-search-engine': 'Google',
     'search.offer-search-suggestions': false, // false by default for privacy reasons
     'tabs.switch-to-new-tabs': false,

diff --git a/js/constants/settings.js b/js/constants/settings.js
@@ -11,6 +11,7 @@ const settings = {
   DEFAULT_DOWNLOAD_SAVE_PATH: 'general.downloads.default-save-path',
   AUTO_HIDE_MENU: 'general.autohide-menu',
   DISABLE_TITLE_MODE: 'general.disable-title-mode',
+  DISABLE_CUSTOM_TITLEBAR: 'general.disable-custom-titlebar',
   // Search tab
   DEFAULT_SEARCH_ENGINE: 'search.default-search-engine',
   OFFER_SEARCH_SUGGESTIONS: 'search.offer-search-suggestions',

diff --git a/js/stores/appStore.js b/js/stores/appStore.js
@@ -126,6 +126,7 @@ const createWindow = (browserOpts, defaults, frameOpts, windowState) => {
   browserOpts.height = browserOpts.height < minHeight ? minHeight : browserOpts.height
 
   const autoHideMenuBarSetting = isDarwin || getSetting(settings.AUTO_HIDE_MENU)
+  const isCustomTitlebarDisabled = !isWindows || getSetting(settings.DISABLE_CUSTOM_TITLEBAR)
 
   const windowProps = {
     // smaller min size for "modal" windows
@@ -138,7 +139,7 @@ const createWindow = (browserOpts, defaults, frameOpts, windowState) => {
     autoHideMenuBar: autoHideMenuBarSetting,
     title: appConfig.name,
     webPreferences: defaults.webPreferences,
-    frame: !isWindows
+    frame: isCustomTitlebarDisabled
   }
 
   if (process.platform === 'linux') {

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