Merge pull request #9572 from shubham2892/api-height-menubar-macos
API height menubar macos
This commit is contained in:
commit
9a362eed53
6 changed files with 41 additions and 0 deletions
|
@ -120,6 +120,9 @@ void Screen::BuildPrototype(
|
||||||
.SetMethod("getPrimaryDisplay", &Screen::GetPrimaryDisplay)
|
.SetMethod("getPrimaryDisplay", &Screen::GetPrimaryDisplay)
|
||||||
.SetMethod("getAllDisplays", &Screen::GetAllDisplays)
|
.SetMethod("getAllDisplays", &Screen::GetAllDisplays)
|
||||||
.SetMethod("getDisplayNearestPoint", &Screen::GetDisplayNearestPoint)
|
.SetMethod("getDisplayNearestPoint", &Screen::GetDisplayNearestPoint)
|
||||||
|
#if defined(OS_MACOSX)
|
||||||
|
.SetMethod("getMenuBarHeight", &Screen::getMenuBarHeight)
|
||||||
|
#endif
|
||||||
.SetMethod("getDisplayMatching", &Screen::GetDisplayMatching);
|
.SetMethod("getDisplayMatching", &Screen::GetDisplayMatching);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -40,6 +40,10 @@ class Screen : public mate::EventEmitter<Screen>,
|
||||||
display::Display GetDisplayNearestPoint(const gfx::Point& point);
|
display::Display GetDisplayNearestPoint(const gfx::Point& point);
|
||||||
display::Display GetDisplayMatching(const gfx::Rect& match_rect);
|
display::Display GetDisplayMatching(const gfx::Rect& match_rect);
|
||||||
|
|
||||||
|
#if defined(OS_MACOSX)
|
||||||
|
int getMenuBarHeight();
|
||||||
|
#endif
|
||||||
|
|
||||||
// display::DisplayObserver:
|
// display::DisplayObserver:
|
||||||
void OnDisplayAdded(const display::Display& new_display) override;
|
void OnDisplayAdded(const display::Display& new_display) override;
|
||||||
void OnDisplayRemoved(const display::Display& old_display) override;
|
void OnDisplayRemoved(const display::Display& old_display) override;
|
||||||
|
|
18
atom/browser/api/atom_api_screen_mac.mm
Normal file
18
atom/browser/api/atom_api_screen_mac.mm
Normal file
|
@ -0,0 +1,18 @@
|
||||||
|
// Copyright (c) 2017 GitHub, Inc.
|
||||||
|
// Use of this source code is governed by the MIT license that can be
|
||||||
|
// found in the LICENSE file.
|
||||||
|
|
||||||
|
#import "atom/browser/api/atom_api_screen.h"
|
||||||
|
#import <Cocoa/Cocoa.h>
|
||||||
|
|
||||||
|
namespace atom {
|
||||||
|
|
||||||
|
namespace api {
|
||||||
|
|
||||||
|
int Screen::getMenuBarHeight() {
|
||||||
|
return [[NSApp mainMenu] menuBarHeight];
|
||||||
|
}
|
||||||
|
|
||||||
|
}// namespace api
|
||||||
|
|
||||||
|
}// namespace atom
|
|
@ -95,6 +95,10 @@ Returns [`Point`](structures/point.md)
|
||||||
|
|
||||||
The current absolute position of the mouse pointer.
|
The current absolute position of the mouse pointer.
|
||||||
|
|
||||||
|
### `screen.getMenuBarHeight()` _macOS_
|
||||||
|
|
||||||
|
Returns `Integer` - The height of the menu bar in pixels.
|
||||||
|
|
||||||
### `screen.getPrimaryDisplay()`
|
### `screen.getPrimaryDisplay()`
|
||||||
|
|
||||||
Returns [`Display`](structures/display.md) - The primary display.
|
Returns [`Display`](structures/display.md) - The primary display.
|
||||||
|
|
|
@ -140,6 +140,7 @@
|
||||||
'atom/browser/api/atom_api_render_process_preferences.h',
|
'atom/browser/api/atom_api_render_process_preferences.h',
|
||||||
'atom/browser/api/atom_api_screen.cc',
|
'atom/browser/api/atom_api_screen.cc',
|
||||||
'atom/browser/api/atom_api_screen.h',
|
'atom/browser/api/atom_api_screen.h',
|
||||||
|
'atom/browser/api/atom_api_screen_mac.mm',
|
||||||
'atom/browser/api/atom_api_session.cc',
|
'atom/browser/api/atom_api_session.cc',
|
||||||
'atom/browser/api/atom_api_session.h',
|
'atom/browser/api/atom_api_session.h',
|
||||||
'atom/browser/api/atom_api_system_preferences.cc',
|
'atom/browser/api/atom_api_system_preferences.cc',
|
||||||
|
|
|
@ -18,4 +18,15 @@ describe('screen module', function () {
|
||||||
assert(display.size.height > 0)
|
assert(display.size.height > 0)
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
describe('screen.getMenuBarHeight()', function () {
|
||||||
|
if (process.platform !== 'darwin') {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
it('returns an integer', function () {
|
||||||
|
var screenHeight = screen.getMenuBarHeight()
|
||||||
|
assert.equal(typeof screenHeight, 'number')
|
||||||
|
})
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue