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

Merge pull request #2595 from atom/mac-tray-quick-click

Browse source 
mac: make tray's behavior more official when getting clicked quickly multiple times.
This commit is contained in:
Cheng Zhao 2015-08-26 17:18:51 +08:00
commit 3e5449561f
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -207,8 +207,14 @@ const CGFloat kVerticalTitleMargin = 2;
} }
inMouseEventSequence_ = NO; inMouseEventSequence_ = NO;
// Show menu when single clicked on the icon. // Show menu when there is a context menu.
if (event.clickCount == 1 && menuController_) // NB(hokein): Make tray's behavior more like official one's.
// When the tray icon gets clicked quickly multiple times, the
// event.clickCount doesn't always return 1. Instead, it returns a value that
// counts the clicked times.
// So we don't check the clickCount here, just pop up the menu for each click
// event.
if (menuController_)
[statusItem_ popUpStatusItemMenu:[menuController_ menu]]; [statusItem_ popUpStatusItemMenu:[menuController_ menu]];
// Don't emit click events when menu is showing. // Don't emit click events when menu is showing.