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

Merge pull request #5518 from danhp/popup-show-all

Browse source 
Fix context menu positioning on OS X
This commit is contained in:
Cheng Zhao 2016-05-14 20:00:30 +09:00
commit de08473ea3
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -46,6 +46,20 @@ void MenuMac::PopupAt(Window* window, int x, int y, int positioning_item) {
position = NSMakePoint(x, [view frame].size.height - y); position = NSMakePoint(x, [view frame].size.height - y);
} }
// If no preferred item is specified, try to show all of the menu items.
if (!positioning_item) {
int windowBottom = CGRectGetMinY([view window].frame);
int distaceFromBottom = windowBottom + position.y - [menu size].height;
if (distaceFromBottom < 0)
position.y = position.y - distaceFromBottom;
}
// Place the menu left of cursor if it is overflowing off right of screen.
int windowLeft = CGRectGetMinX([view window].frame);
int rightmostPoint = windowLeft + position.x + [menu size].width;
if (rightmostPoint > [[NSScreen mainScreen] visibleFrame].size.width)
position.x = position.x - [menu size].width;
// Show the menu. // Show the menu.
[menu popUpMenuPositioningItem:item atLocation:position inView:view]; [menu popUpMenuPositioningItem:item atLocation:position inView:view];
} }