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

popContextMenu => popUpContextMenu

Browse source
This commit is contained in:
Cheng Zhao 2015-08-10 13:00:15 +08:00
parent 225140bd64
commit 33eadad139
10 changed files with 19 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
atom/browser/ui/tray_icon_cocoa.mm
View file

@ -230,7 +230,7 @@ const CGFloat kVerticalTitleMargin = 2;
[self setNeedsDisplay:YES];
}
- (void)popContextMenu {
- (void)popUpContextMenu {
if (menuController_ && ![menuController_ isMenuOpen]) {
// Redraw the dray icon to show highlight if it is enabled.
[self setNeedsDisplay:YES];
@ -316,8 +316,8 @@ void TrayIconCocoa::SetHighlightMode(bool highlight) {
[status_item_view_ setHighlight:highlight];
}
void TrayIconCocoa::PopContextMenu(const gfx::Point& pos) {
[status_item_view_ popContextMenu];
void TrayIconCocoa::PopUpContextMenu(const gfx::Point& pos) {
[status_item_view_ popUpContextMenu];
}
void TrayIconCocoa::SetContextMenu(ui::SimpleMenuModel* menu_model) {