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

Add 'tray.popContextMenu()' Windows implementation.

Browse source
This commit is contained in:
Haojian Wu 2015-07-16 11:39:49 +08:00
parent 4421fbf9f3
commit ed4c69343f
6 changed files with 26 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

6
atom/browser/api/atom_api_tray.cc
View file

@ -106,8 +106,10 @@ void Tray::DisplayBalloon(mate::Arguments* args,
tray_icon_->DisplayBalloon(icon, title, content);
}
void Tray::PopContextMenu() {
tray_icon_->PopContextMenu();
void Tray::PopContextMenu(mate::Arguments* args) {
gfx::Point pos;
args->GetNext(&pos);
tray_icon_->PopContextMenu(pos);
}
void Tray::SetContextMenu(mate::Arguments* args, Menu* menu) {

2
atom/browser/api/atom_api_tray.h
View file

@ -58,7 +58,7 @@ class Tray : public mate::EventEmitter,
void SetTitle(mate::Arguments* args, const std::string& title);
void SetHighlightMode(mate::Arguments* args, bool highlight);
void DisplayBalloon(mate::Arguments* args, const mate::Dictionary& options);
void PopContextMenu();
void PopContextMenu(mate::Arguments* args);
void SetContextMenu(mate::Arguments* args, Menu* menu);
private: