Refactor tray icon event handling across platforms

Removed platform-specific HandleLeftClick, HandleRightClick, and HandleDoubleClick methods from TrayIcon and replaced them with direct event emission in platform code. On macOS, click handling is now managed via blocks in the delegate, improving encapsulation and flexibility. Updated TrayIcon to inherit from NativeObjectProvider and added GetNativeObjectInternal for native object access. Minor formatting and cleanup applied in example and platform files.

Author: lijy91

examples/window_example/main.cpp

@@ -82,7 +82,9 @@ int main() {
         "wLVwWPG97osM9Wf7Df6GGOwnsP4BQFiPuOZ8wJUAAAAASUVORK5CYII=");
     std::cout << "Tray ID: " << tray_icon.id << std::endl;
     auto title = tray_icon.GetTitle();
-    std::cout << "Tray Title: " << (title.has_value() ? title.value() : "(no title)") << std::endl;
+    std::cout << "Tray Title: "
+              << (title.has_value() ? title.value() : "(no title)")
+              << std::endl;
 
     // Create context menu
     auto context_menu = Menu::Create();

src/platform/linux/tray_icon_linux.cpp

@@ -163,7 +163,7 @@ bool TrayIcon::SetVisible(bool visible) {
     app_indicator_set_status(pimpl_->app_indicator_,
                              APP_INDICATOR_STATUS_PASSIVE);
   }
-  
+
   pimpl_->visible_ = visible;
   return true;
 }
@@ -210,29 +210,4 @@ bool TrayIcon::CloseContextMenu() {
   return true;
 }
 
-// Internal method to handle click events
-void TrayIcon::HandleLeftClick() {
-  try {
-    EmitSync<TrayIconClickedEvent>(id, "left");
-  } catch (...) {
-    // Protect against event emission exceptions
-  }
-}
-
-void TrayIcon::HandleRightClick() {
-  try {
-    EmitSync<TrayIconRightClickedEvent>(id);
-  } catch (...) {
-    // Protect against event emission exceptions
-  }
-}
-
-void TrayIcon::HandleDoubleClick() {
-  try {
-    EmitSync<TrayIconDoubleClickedEvent>(id);
-  } catch (...) {
-    // Protect against event emission exceptions
-  }
-}
-
 }  // namespace nativeapi

src/platform/macos/tray_icon_macos.mm

@@ -10,10 +10,16 @@
 // for proper memory management of Objective-C objects.
 
 // Forward declarations
+typedef void (^TrayIconClickedBlock)(nativeapi::TrayIconID tray_icon_id, const std::string& button);
+typedef void (^TrayIconRightClickedBlock)(nativeapi::TrayIconID tray_icon_id);
+typedef void (^TrayIconDoubleClickedBlock)(nativeapi::TrayIconID tray_icon_id);
+
 @interface TrayIconDelegate : NSObject
 @property(nonatomic, assign) nativeapi::TrayIcon* trayIcon;
+@property(nonatomic, copy) TrayIconClickedBlock leftClickedBlock;
+@property(nonatomic, copy) TrayIconRightClickedBlock rightClickedBlock;
+@property(nonatomic, copy) TrayIconDoubleClickedBlock doubleClickedBlock;
 - (void)statusItemClicked:(id)sender;
-- (void)statusItemRightClicked:(id)sender;
 @end
 
 @interface TrayIconMenuDelegate : NSObject <NSMenuDelegate>
@@ -48,14 +54,17 @@ @interface TrayIconMenuDelegate : NSObject <NSMenuDelegate>
   }
 
   ~Impl() {
-    // First, clean up delegates to prevent callbacks
+    // Clean up blocks first
     if (delegate_) {
-      delegate_.trayIcon = nullptr;  // Clear the raw pointer first
+      delegate_.leftClickedBlock = nil;
+      delegate_.rightClickedBlock = nil;
+      delegate_.doubleClickedBlock = nil;
+      delegate_.trayIcon = nullptr;
       delegate_ = nil;
     }
 
     if (menu_delegate_) {
-      menu_delegate_.trayIcon = nullptr;  // Clear the raw pointer first
+      menu_delegate_.trayIcon = nullptr;
       menu_delegate_ = nil;
     }
 
@@ -88,6 +97,31 @@ @interface TrayIconMenuDelegate : NSObject <NSMenuDelegate>
   id = -1;
   if (pimpl_->delegate_) {
     pimpl_->delegate_.trayIcon = this;
+
+    // 设置默认的 Block 处理器，直接发送事件
+    pimpl_->delegate_.leftClickedBlock = ^(TrayIconID tray_icon_id, const std::string& button) {
+      try {
+        EmitSync<TrayIconClickedEvent>(tray_icon_id, button);
+      } catch (...) {
+        // Protect against event emission exceptions
+      }
+    };
+
+    pimpl_->delegate_.rightClickedBlock = ^(TrayIconID tray_icon_id) {
+      try {
+        EmitSync<TrayIconRightClickedEvent>(tray_icon_id);
+      } catch (...) {
+        // Protect against event emission exceptions
+      }
+    };
+
+    pimpl_->delegate_.doubleClickedBlock = ^(TrayIconID tray_icon_id) {
+      try {
+        EmitSync<TrayIconDoubleClickedEvent>(tray_icon_id);
+      } catch (...) {
+        // Protect against event emission exceptions
+      }
+    };
   }
   if (pimpl_->menu_delegate_) {
     pimpl_->menu_delegate_.trayIcon = this;
@@ -98,6 +132,31 @@ @interface TrayIconMenuDelegate : NSObject <NSMenuDelegate>
   id = -1;  // Will be set by TrayManager when created
   if (pimpl_->delegate_) {
     pimpl_->delegate_.trayIcon = this;
+
+    // 设置默认的 Block 处理器，直接发送事件
+    pimpl_->delegate_.leftClickedBlock = ^(TrayIconID tray_icon_id, const std::string& button) {
+      try {
+        EmitSync<TrayIconClickedEvent>(tray_icon_id, button);
+      } catch (...) {
+        // Protect against event emission exceptions
+      }
+    };
+
+    pimpl_->delegate_.rightClickedBlock = ^(TrayIconID tray_icon_id) {
+      try {
+        EmitSync<TrayIconRightClickedEvent>(tray_icon_id);
+      } catch (...) {
+        // Protect against event emission exceptions
+      }
+    };
+
+    pimpl_->delegate_.doubleClickedBlock = ^(TrayIconID tray_icon_id) {
+      try {
+        EmitSync<TrayIconDoubleClickedEvent>(tray_icon_id);
+      } catch (...) {
+        // Protect against event emission exceptions
+      }
+    };
   }
   if (pimpl_->menu_delegate_) {
     pimpl_->menu_delegate_.trayIcon = this;
@@ -295,35 +354,8 @@ @interface TrayIconMenuDelegate : NSObject <NSMenuDelegate>
   return pimpl_->context_menu_->Close();
 }
 
-// Internal method to handle click events
-void TrayIcon::HandleLeftClick() {
-  try {
-    EmitSync<TrayIconClickedEvent>(id, "left");
-  } catch (...) {
-    // Protect against event emission exceptions
-  }
-}
-
-void TrayIcon::HandleRightClick() {
-  try {
-    EmitSync<TrayIconRightClickedEvent>(id);
-  } catch (...) {
-    // Protect against event emission exceptions
-  }
-}
-
-void TrayIcon::HandleDoubleClick() {
-  try {
-    EmitSync<TrayIconDoubleClickedEvent>(id);
-  } catch (...) {
-    // Protect against event emission exceptions
-  }
-}
-
-void TrayIcon::ClearStatusItemMenu() {
-  if (pimpl_->ns_status_item_) {
-    pimpl_->ns_status_item_.menu = nil;
-  }
+void* TrayIcon::GetNativeObjectInternal() const {
+  return (__bridge void*)pimpl_->ns_status_item_;
 }
 
 }  // namespace nativeapi
@@ -345,29 +377,28 @@ - (void)statusItemClicked:(id)sender {
   if (!event)
     return;
 
-  // Check the type of click
+  // Check the type of click and call appropriate block
   if (event.type == NSEventTypeRightMouseUp ||
       (event.type == NSEventTypeLeftMouseUp &&
        (event.modifierFlags & NSEventModifierFlagControl))) {
     // Right click or Ctrl+Left click
-    trayIcon->HandleRightClick();
+    if (_rightClickedBlock) {
+      _rightClickedBlock(trayIcon->id);
+    }
   } else if (event.type == NSEventTypeLeftMouseUp) {
     // Check for double click
     if (event.clickCount == 2) {
-      trayIcon->HandleDoubleClick();
+      if (_doubleClickedBlock) {
+        _doubleClickedBlock(trayIcon->id);
+      }
     } else {
-      trayIcon->HandleLeftClick();
+      if (_leftClickedBlock) {
+        _leftClickedBlock(trayIcon->id, "left");
+      }
     }
   }
 }
 
-- (void)statusItemRightClicked:(id)sender {
-  // Check if trayIcon is still valid before proceeding
-  if (_trayIcon) {
-    _trayIcon->HandleRightClick();
-  }
-}
-
 @end
 
 // Implementation of TrayIconMenuDelegate
@@ -376,8 +407,9 @@ @implementation TrayIconMenuDelegate
 - (void)menuDidClose:(NSMenu*)menu {
   // Check if trayIcon is still valid before proceeding
   if (_trayIcon) {
+    NSStatusItem* ns_status_item_ = (__bridge NSStatusItem*)_trayIcon->GetNativeObject();
     // Call a public method to clear the menu (we'll add this method)
-    _trayIcon->ClearStatusItemMenu();
+    ns_status_item_.menu = nil;
   }
 }
 

src/platform/windows/tray_icon_windows.cpp

@@ -50,16 +50,28 @@ class TrayIcon::Impl {
     if (message == WM_USER + 1 && wParam == icon_id_) {
       switch (lParam) {
         case WM_LBUTTONUP:
-          tray_icon->HandleLeftClick();
+          try {
+            tray_icon->EmitSync<TrayIconClickedEvent>(tray_icon->id, "left");
+          } catch (...) {
+            // Protect against event emission exceptions
+          }
           break;
         case WM_RBUTTONUP:
-          tray_icon->HandleRightClick();
+          try {
+            tray_icon->EmitSync<TrayIconRightClickedEvent>(tray_icon->id);
+          } catch (...) {
+            // Protect against event emission exceptions
+          }
           if (tray_icon->GetContextMenu()) {
             tray_icon->OpenContextMenu();
           }
           break;
         case WM_LBUTTONDBLCLK:
-          tray_icon->HandleDoubleClick();
+          try {
+            tray_icon->EmitSync<TrayIconDoubleClickedEvent>(tray_icon->id);
+          } catch (...) {
+            // Protect against event emission exceptions
+          }
           break;
       }
       return 0;
@@ -225,7 +237,7 @@ bool TrayIcon::SetVisible(bool visible) {
     // Already in the desired state
     return true;
   }
-  
+
   return false;
 }
 
@@ -267,31 +279,6 @@ bool TrayIcon::CloseContextMenu() {
   return pimpl_->context_menu_->Close();
 }
 
-// Internal method to handle click events
-void TrayIcon::HandleLeftClick() {
-  try {
-    EmitSync<TrayIconClickedEvent>(id, "left");
-  } catch (...) {
-    // Protect against event emission exceptions
-  }
-}
-
-void TrayIcon::HandleRightClick() {
-  try {
-    EmitSync<TrayIconRightClickedEvent>(id);
-  } catch (...) {
-    // Protect against event emission exceptions
-  }
-}
-
-void TrayIcon::HandleDoubleClick() {
-  try {
-    EmitSync<TrayIconDoubleClickedEvent>(id);
-  } catch (...) {
-    // Protect against event emission exceptions
-  }
-}
-
 // Note: Windows-specific functionality is now handled internally by the Impl
 // class The SetWindowsData and HandleWindowsMessage methods have been moved to
 // the Impl class to maintain proper encapsulation and avoid exposing

src/tray_icon.h

@@ -61,7 +61,7 @@ typedef long TrayIconID;
  * trayIcon->Show();
  * ```
  */
-class TrayIcon : public EventEmitter {
+class TrayIcon : public EventEmitter, public NativeObjectProvider {
  public:
   /**
    * @brief Default constructor for TrayIcon.
@@ -316,38 +316,16 @@ class TrayIcon : public EventEmitter {
    */
   bool CloseContextMenu();
 
+ protected:
   /**
-   * @brief Internal method to handle left mouse click events.
+   * @brief Internal method to get the platform-specific native tray icon object.
    *
-   * This method is called internally by platform-specific code
-   * when a left click event occurs on the tray icon.
-   */
-  void HandleLeftClick();
-
-  /**
-   * @brief Internal method to handle right mouse click events.
-   *
-   * This method is called internally by platform-specific code
-   * when a right click event occurs on the tray icon.
-   */
-  void HandleRightClick();
-
-  /**
-   * @brief Internal method to handle double click events.
-   *
-   * This method is called internally by platform-specific code
-   * when a double click event occurs on the tray icon.
-   */
-  void HandleDoubleClick();
-
-  /**
-   * @brief Clear the menu reference from the status item.
+   * This method must be implemented by platform-specific code to return
+   * the underlying native tray icon object.
    *
-   * This method is used internally to clean up the menu reference
-   * when the context menu is closed. It's called by the menu delegate
-   * to ensure proper cleanup.
+   * @return Pointer to the native menu item object
    */
-  void ClearStatusItemMenu();
+  void* GetNativeObjectInternal() const override;
 
  private:
   /**