diff --git a/src/atom.coffee b/src/atom.coffee index 3d0dcc111..160a4eff0 100644 --- a/src/atom.coffee +++ b/src/atom.coffee @@ -641,6 +641,7 @@ class Atom extends Model @requireUserInitScript() unless safeMode @menu.update() + @commands.add 'atom-workspace', 'atom-workspace:add-account': => @newWindow @@ -687,9 +688,6 @@ class Atom extends Model @setWindowDimensions({width, height}) if width and height @menu.update() - @subscribe @config.onDidChange 'core.autoHideMenuBar', ({newValue}) => - @setAutoHideMenuBar(newValue) - @setAutoHideMenuBar(true) if @config.get('core.autoHideMenuBar') ipc.sendChannel('window-command', 'window:loaded') @@ -903,10 +901,6 @@ class Atom extends Model updateAvailable: (details) -> @emitter.emit 'update-available', details - setAutoHideMenuBar: (autoHide) -> - ipc.send('call-window-method', 'setAutoHideMenuBar', autoHide) - ipc.send('call-window-method', 'setMenuBarVisibility', !autoHide) - # Lets multiple components register beforeUnload callbacks. # The callbacks are expected to return either true or false. # diff --git a/src/browser/atom-window.coffee b/src/browser/atom-window.coffee index 8e9bd8066..62bf293e5 100644 --- a/src/browser/atom-window.coffee +++ b/src/browser/atom-window.coffee @@ -24,7 +24,6 @@ class AtomWindow toolbar, resizable, pathToOpen, - hideMenuBar, @isSpec, @devMode, @safeMode, @@ -57,7 +56,6 @@ class AtomWindow height: height resizable: resizable ? true icon: @constructor.iconPath - 'auto-hide-menu-bar': hideMenuBar 'web-preferences': 'direct-write': true 'subpixel-font-scaling': true diff --git a/src/browser/window-manager.coffee b/src/browser/window-manager.coffee index b539212ed..217baa25a 100644 --- a/src/browser/window-manager.coffee +++ b/src/browser/window-manager.coffee @@ -266,7 +266,6 @@ class WindowManager devMode: @devMode safeMode: @safeMode windowType: 'popout' - hideMenuBar: true resourcePath: @resourcePath bootstrapScript: require.resolve("../window-secondary-bootstrap") diff --git a/src/config-schema.coffee b/src/config-schema.coffee index b0b7a950a..b67293c04 100644 --- a/src/config-schema.coffee +++ b/src/config-schema.coffee @@ -1,6 +1,3 @@ -path = require 'path' -fs = require 'fs-plus' - # This is loaded by atom.coffee. See https://atom.io/docs/api/latest/Config for # more information about config schemas. module.exports = @@ -56,9 +53,3 @@ module.exports = type: 'string' default: 'reply-all' enum: ['reply', 'reply-all'] - -if process.platform in ['win32', 'linux'] - module.exports.core.properties.autoHideMenuBar = - type: 'boolean' - default: false - description: 'Automatically hide the menu bar and toggle it by pressing Alt. This is only supported on Windows & Linux.' diff --git a/src/window-event-handler.coffee b/src/window-event-handler.coffee index 8fe3b2a7a..64edd231e 100644 --- a/src/window-event-handler.coffee +++ b/src/window-event-handler.coffee @@ -82,10 +82,6 @@ class WindowEventHandler ReactRemote = require './react-remote/react-remote-parent' ReactRemote.toggleContainerVisible() - if process.platform in ['win32', 'linux'] - @subscribeToCommand $(window), 'window:toggle-menu-bar', -> - atom.config.set('core.autoHideMenuBar', !atom.config.get('core.autoHideMenuBar')) - @subscribeToCommand $(document), 'core:focus-next', @focusNext @subscribeToCommand $(document), 'core:focus-previous', @focusPrevious