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

win: Correctly close popup menu

Browse Source
This commit is contained in:
Cheng Zhao
2017-12-21 15:26:32 +09:00
parent 459db92052
commit 088042841d
3 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/browser/api/menu.js
View File

@@ -94,10 +94,13 @@ Menu.prototype.popup = function (window, x, y, positioningItem) {
}
Menu.prototype.closePopup = function (window) {
if (!window || window.constructor !== BrowserWindow) {
window = BrowserWindow.getFocusedWindow()
if (window && window.constructor !== BrowserWindow) {
this.closePopupAt(window.id)
} else {
// Passing -1 (invalid) would make closePopupAt close the all menu runners
// belong to this menu.
this.closePopupAt(-1)
}
if (window) this.closePopupAt(window.id)
}
Menu.prototype.getMenuItemById = function (id) {