github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-05-02 03:00:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: close context menu before popup (#17474)

Browse Source
This commit is contained in:
Cheng Zhao
2019-03-22 13:56:22 +09:00
committed by Shelley Vohr
parent d2ad8efef4
commit 49f13e38f9
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
atom/browser/ui/win/notify_icon.cc
View File

@@ -142,6 +142,10 @@ void NotifyIcon::PopUpContextMenu(const gfx::Point& pos,
if (!SetForegroundWindow(window_))
return;
// Cancel current menu if there is one.
if (menu_runner_ && menu_runner_->IsRunning())
menu_runner_->Cancel();
// Show menu at mouse's position by default.
gfx::Rect rect(pos, gfx::Size());
if (pos.IsOrigin())