github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-09 15:38:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

🎨

Browse Source
This commit is contained in:
Kevin Sawicki
2017-06-05 10:33:46 -07:00
parent e9aa9eaf5e
commit 653ef6f839
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
atom/browser/api/atom_api_screen.h
View File

@@ -39,9 +39,11 @@ class Screen : public mate::EventEmitter<Screen>,
std::vector<display::Display> GetAllDisplays(); std::vector<display::Display> GetAllDisplays();
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) #if defined(OS_MACOSX)
int getMenuBarHeight(); int getMenuBarHeight();
#endif #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;

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

@@ -8,6 +8,7 @@
namespace atom { namespace atom {
namespace api { namespace api {
int Screen::getMenuBarHeight() { int Screen::getMenuBarHeight() {
return [[NSApp mainMenu] menuBarHeight]; return [[NSApp mainMenu] menuBarHeight];
} }

4
docs/api/screen.md
View File

@@ -97,9 +97,7 @@ The current absolute position of the mouse pointer.
### `screen.getMenuBarHeight()` _macOS_ ### `screen.getMenuBarHeight()` _macOS_
Returns `Integer` - Height Returns `Integer` - The height of the menu bar in pixels.
The height of toolbar in pixels.
### `screen.getPrimaryDisplay()` ### `screen.getPrimaryDisplay()`