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

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())