diff --git a/atom/browser/api/atom_api_screen_mac.mm b/atom/browser/api/atom_api_screen_mac.mm index 0d22fad5b8b5..056b775fdfc2 100644 --- a/atom/browser/api/atom_api_screen_mac.mm +++ b/atom/browser/api/atom_api_screen_mac.mm @@ -9,6 +9,7 @@ namespace atom { namespace api { +//TODO(codebytere): deprecated; remove in 3.0 int Screen::getMenuBarHeight() { return [[NSApp mainMenu] menuBarHeight]; } diff --git a/lib/browser/api/screen.js b/lib/browser/api/screen.js index 8287bfa8bfdc..bbbc1bbe1727 100644 --- a/lib/browser/api/screen.js +++ b/lib/browser/api/screen.js @@ -1,8 +1,17 @@ const {EventEmitter} = require('events') +const {deprecate} = require('electron') const {screen, Screen} = process.atomBinding('screen') // Screen is an EventEmitter. Object.setPrototypeOf(Screen.prototype, EventEmitter.prototype) EventEmitter.call(screen) +const nativeFn = screen.getMenuBarHeight +screen.getMenuBarHeight = function () { + if (!process.noDeprecations) { + deprecate.warn('screen.getMenuBarHeight', 'screen.getPrimaryDisplay().workArea') + } + return nativeFn.call(this) +} + module.exports = screen