fix: emit click events with tray context menu (electron#24235)

trop[bot] · codebytere · web-flow · commit 0e0dd6460f50 · 2020-06-22T19:02:54.000-07:00
Co-authored-by: Shelley Vohr &lt;shelley.vohr@gmail.com&gt;
diff --git a/shell/browser/ui/tray_icon_cocoa.mm b/shell/browser/ui/tray_icon_cocoa.mm
@@ -130,6 +130,26 @@ - (void)setMenuController:(ElectronMenuController*)menu {
   [statusItem_ setMenu:[menuController_ menu]];
 }
 
+- (void)handleClickNotifications:(NSEvent*)event {
+  // If we are ignoring double click events, we should ignore the `clickCount`
+  // value and immediately emit a click event.
+  BOOL shouldBeHandledAsASingleClick =
+      (event.clickCount == 1) || ignoreDoubleClickEvents_;
+  if (shouldBeHandledAsASingleClick)
+    trayIcon_->NotifyClicked(
+        gfx::ScreenRectFromNSRect(event.window.frame),
+        gfx::ScreenPointFromNSPoint([event locationInWindow]),
+        ui::EventFlagsFromModifiers([event modifierFlags]));
+
+  // Double click event.
+  BOOL shouldBeHandledAsADoubleClick =
+      (event.clickCount == 2) && !ignoreDoubleClickEvents_;
+  if (shouldBeHandledAsADoubleClick)
+    trayIcon_->NotifyDoubleClicked(
+        gfx::ScreenRectFromNSRect(event.window.frame),
+        ui::EventFlagsFromModifiers([event modifierFlags]));
+}
+
 - (void)mouseDown:(NSEvent*)event {
   trayIcon_->NotifyMouseDown(
       gfx::ScreenPointFromNSPoint([event locationInWindow]),
@@ -138,6 +158,7 @@ - (void)mouseDown:(NSEvent*)event {
   // Pass click to superclass to show menu. Custom mouseUp handler won't be
   // invoked.
   if (menuController_) {
+    [self handleClickNotifications:event];
     [super mouseDown:event];
   } else {
     [[statusItem_ button] highlight:YES];
@@ -151,23 +172,7 @@ - (void)mouseUp:(NSEvent*)event {
       gfx::ScreenPointFromNSPoint([event locationInWindow]),
       ui::EventFlagsFromModifiers([event modifierFlags]));
 
-  // If we are ignoring double click events, we should ignore the `clickCount`
-  // value and immediately emit a click event.
-  BOOL shouldBeHandledAsASingleClick =
-      (event.clickCount == 1) || ignoreDoubleClickEvents_;
-  if (shouldBeHandledAsASingleClick)
-    trayIcon_->NotifyClicked(
-        gfx::ScreenRectFromNSRect(event.window.frame),
-        gfx::ScreenPointFromNSPoint([event locationInWindow]),
-        ui::EventFlagsFromModifiers([event modifierFlags]));
-
-  // Double click event.
-  BOOL shouldBeHandledAsADoubleClick =
-      (event.clickCount == 2) && !ignoreDoubleClickEvents_;
-  if (shouldBeHandledAsADoubleClick)
-    trayIcon_->NotifyDoubleClicked(
-        gfx::ScreenRectFromNSRect(event.window.frame),
-        ui::EventFlagsFromModifiers([event modifierFlags]));
+  [self handleClickNotifications:event];
 }
 
 - (void)popUpContextMenu:(electron::ElectronMenuModel*)menu_model {
