mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Merge pull request #12135 from electron/deprecate-getMenuBarHeight

Browse source 
deprecate screen.getMenuBarHeight
This commit is contained in:
shelley vohr 2018-03-05 17:56:51 -08:00 • committed by GitHub
commit a3d4d461a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
atom/browser/api/atom_api_screen_mac.mm
View file

@ -9,6 +9,7 @@ namespace atom {
namespace api { namespace api {
//TODO(codebytere): deprecated; remove in 3.0
int Screen::getMenuBarHeight() { int Screen::getMenuBarHeight() {
return [[NSApp mainMenu] menuBarHeight]; return [[NSApp mainMenu] menuBarHeight];
} }

9
lib/browser/api/screen.js
View file

@ -1,8 +1,17 @@
const {EventEmitter} = require('events') const {EventEmitter} = require('events')
const {deprecate} = require('electron')
const {screen, Screen} = process.atomBinding('screen') const {screen, Screen} = process.atomBinding('screen')
// Screen is an EventEmitter. // Screen is an EventEmitter.
Object.setPrototypeOf(Screen.prototype, EventEmitter.prototype) Object.setPrototypeOf(Screen.prototype, EventEmitter.prototype)
EventEmitter.call(screen) 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 module.exports = screen

13
spec/api-screen-spec.js
View file

@ -18,17 +18,4 @@ describe('screen module', () => {
assert(display.size.height > 0) assert(display.size.height > 0)
}) })
}) })
describe('screen.getMenuBarHeight()', () => {
before(function () {
if (process.platform !== 'darwin') {
this.skip()
}
})
it('returns an integer', () => {
const screenHeight = screen.getMenuBarHeight()
assert.equal(typeof screenHeight, 'number')
})
})
}) })