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

feat: add tray.closeContextMenu() (#21807)

Browse source
This commit is contained in:
Shelley Vohr 2020-01-22 15:25:17 -08:00 • committed by GitHub
parent 87af95be3e
commit b90537a629
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 45 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
shell/browser/ui/win/notify_icon.cc
View file

@ -199,8 +199,7 @@ void NotifyIcon::PopUpContextMenu(const gfx::Point& pos,
return;
// Cancel current menu if there is one.
if (menu_runner_ && menu_runner_->IsRunning())
menu_runner_->Cancel();
CloseContextMenu();
// Show menu at mouse's position by default.
gfx::Rect rect(pos, gfx::Size());
@ -231,6 +230,12 @@ void NotifyIcon::PopUpContextMenu(const gfx::Point& pos,
ui::MENU_SOURCE_MOUSE);
}
void NotifyIcon::CloseContextMenu() {
if (menu_runner_ && menu_runner_->IsRunning()) {
menu_runner_->Cancel();
}
}
void NotifyIcon::SetContextMenu(AtomMenuModel* menu_model) {
menu_model_ = menu_model;
}

1
shell/browser/ui/win/notify_icon.h
View file

@ -63,6 +63,7 @@ class NotifyIcon : public TrayIcon {
void Focus() override;
void PopUpContextMenu(const gfx::Point& pos,
AtomMenuModel* menu_model) override;
void CloseContextMenu() override;
void SetContextMenu(AtomMenuModel* menu_model) override;
gfx::Rect GetBounds() override;