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

Merge pull request #5726 from danhp/fix-context-menu

Browse source 
Fix context menus only showing on primary monitor.
This commit is contained in:
Cheng Zhao 2016-05-30 00:16:21 +00:00
commit 79cb648b6b
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
atom/browser/api/atom_api_menu_mac.mm
View file

@ -52,15 +52,18 @@ void MenuMac::PopupAt(Window* window, int x, int y, int positioning_item) {
// If no preferred item is specified, try to show all of the menu items. // If no preferred item is specified, try to show all of the menu items.
if (!positioning_item) { if (!positioning_item) {
CGFloat windowBottom = CGRectGetMinY([view window].frame); CGFloat windowBottom = CGRectGetMinY([view window].frame);
CGFloat distaceFromBottom = windowBottom + position.y - [menu size].height; CGFloat lowestMenuPoint = windowBottom + position.y - [menu size].height;
if (distaceFromBottom < 0) CGFloat screenBottom = CGRectGetMinY([view window].screen.frame);
position.y = position.y - distaceFromBottom + 4; CGFloat distanceFromBottom = lowestMenuPoint - screenBottom;
if (distanceFromBottom < 0)
position.y = position.y - distanceFromBottom + 4;
} }
// Place the menu left of cursor if it is overflowing off right of screen. // Place the menu left of cursor if it is overflowing off right of screen.
CGFloat windowLeft = CGRectGetMinX([view window].frame); CGFloat windowLeft = CGRectGetMinX([view window].frame);
CGFloat rightmostPoint = windowLeft + position.x + [menu size].width; CGFloat rightmostMenuPoint = windowLeft + position.x + [menu size].width;
if (rightmostPoint > [[NSScreen mainScreen] visibleFrame].size.width) CGFloat screenRight = CGRectGetMaxX([view window].screen.frame);
if (rightmostMenuPoint > screenRight)
position.x = position.x - [menu size].width; position.x = position.x - [menu size].width;
// Show the menu. // Show the menu.