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

Add menu parameter for Tray.popUpContextMenu

Browse source
This commit is contained in:
Cheng Zhao 2015-12-02 18:43:11 +08:00
parent 202475f5a9
commit 2fba05b5e7
8 changed files with 23 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -137,9 +137,11 @@ void Tray::DisplayBalloon(mate::Arguments* args,
}
void Tray::PopUpContextMenu(mate::Arguments* args) {
Menu* menu = nullptr;
args->GetNext(&menu);
gfx::Point pos;
args->GetNext(&pos);
tray_icon_->PopUpContextMenu(pos);
tray_icon_->PopUpContextMenu(pos, menu ? menu->model() : nullptr);
}
void Tray::SetContextMenu(mate::Arguments* args, Menu* menu) {