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

Merge pull request #4192 from evgenyzinoviev/menu-pr

Browse source 
Menu.popup: specify positioning item (OS X)
This commit is contained in:
Cheng Zhao 2016-01-22 10:49:17 -07:00
commit ea9b0cfed0
7 changed files with 20 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/api/lib/menu.js
View file

@ -158,7 +158,7 @@ Menu.prototype._init = function() {
};
};
Menu.prototype.popup = function(window, x, y) {
Menu.prototype.popup = function(window, x, y, positioningItem) {
if ((window != null ? window.constructor : void 0) !== BrowserWindow) {
// Shift.
y = x;
@ -166,7 +166,7 @@ Menu.prototype.popup = function(window, x, y) {
window = BrowserWindow.getFocusedWindow();
}
if ((x != null) && (y != null)) {
return this._popupAt(window, x, y);
return this._popupAt(window, x, y, positioningItem || 0);
} else {
return this._popup(window);
}