Refactor tray icon creation for platform abstraction

Moved platform-specific tray icon initialization logic into the TrayIcon constructor for Linux, macOS, and Windows. TrayManager::Create now delegates all platform setup to TrayIcon, simplifying manager code and improving encapsulation. Updated documentation to reflect internal platform-specific setup.

Author: lijy91

src/platform/linux/tray_icon_linux.cpp

@@ -30,6 +30,25 @@ class TrayIcon::Impl {
 
 TrayIcon::TrayIcon() : pimpl_(std::make_unique<Impl>(nullptr)) {
   id = -1;
+
+#if HAS_GTK && HAS_AYATANA_APPINDICATOR
+  // Create a unique ID for this tray icon
+  static int next_indicator_id = 1;
+  std::string indicator_id =
+      "nativeapi-tray-" + std::to_string(next_indicator_id++);
+
+  // Create a new tray using AppIndicator
+  AppIndicator* app_indicator =
+      app_indicator_new(indicator_id.c_str(),
+                        "application-default-icon",  // Default icon name
+                        APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
+
+  if (app_indicator) {
+    // Reinitialize the Impl with the created indicator
+    pimpl_ = std::make_unique<Impl>(app_indicator);
+    pimpl_->visible_ = true;
+  }
+#endif
 }
 
 TrayIcon::TrayIcon(void* tray)

src/platform/linux/tray_manager_linux.cpp

@@ -66,20 +66,8 @@ std::shared_ptr<TrayIcon> TrayManager::Create() {
   std::lock_guard<std::mutex> lock(mutex_);
 
 #if HAS_GTK && HAS_AYATANA_APPINDICATOR
-  // Create a unique ID for this tray icon
-  std::string indicator_id = "nativeapi-tray-" + std::to_string(next_tray_id_);
-
-  // Create a new tray using AppIndicator
-  AppIndicator* app_indicator =
-      app_indicator_new(indicator_id.c_str(),
-                        "application-default-icon",  // Default icon name
-                        APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
-
-  if (!app_indicator) {
-    return nullptr;
-  }
-
-  auto tray = std::make_shared<TrayIcon>((void*)app_indicator);
+  // Create tray icon with platform-specific initialization handled internally
+  auto tray = std::make_shared<TrayIcon>();
   tray->id = next_tray_id_++;
   trays_[tray->id] = tray;
 

src/platform/macos/tray_icon_macos.mm

@@ -88,33 +88,43 @@ - (void)statusItemClicked:(id)sender;
 
 TrayIcon::TrayIcon() : pimpl_(std::make_unique<Impl>()) {
   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
-      }
-    };
+  // Create platform-specific NSStatusItem
+  NSStatusBar* status_bar = [NSStatusBar systemStatusBar];
+  NSStatusItem* status_item = [status_bar statusItemWithLength:NSVariableStatusItemLength];
+
+  if (status_item) {
+    // Reinitialize the Impl with the created status item
+    pimpl_ = std::make_unique<Impl>(status_item);
+
+    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
+        }
+      };
+    }
   }
 }
 

src/platform/macos/tray_manager_macos.mm

@@ -59,12 +59,8 @@
 std::shared_ptr<TrayIcon> TrayManager::Create() {
   std::lock_guard<std::mutex> lock(mutex_);
 
-  NSStatusBar* status_bar = [NSStatusBar systemStatusBar];
-  NSStatusItem* status_item = [status_bar statusItemWithLength:NSVariableStatusItemLength];
-
-  std::cout << status_item.visible << std::endl;
-
-  auto tray = std::make_shared<TrayIcon>((__bridge void*)status_item);
+  // Create tray icon with platform-specific initialization handled internally
+  auto tray = std::make_shared<TrayIcon>();
   tray->id = next_tray_id_++;
   trays_[tray->id] = tray;
 

src/platform/windows/tray_icon_windows.cpp

@@ -100,6 +100,36 @@ class TrayIcon::Impl {
 
 TrayIcon::TrayIcon() : pimpl_(std::make_unique<Impl>()) {
   id = -1;
+
+  // Create a hidden window for this tray icon
+  HINSTANCE hInstance = GetModuleHandle(nullptr);
+
+  // Register window class for this tray icon
+  static UINT next_class_id = 1;
+  std::string class_name =
+      "NativeAPITrayIcon_" + std::to_string(next_class_id++);
+
+  WNDCLASS wc = {};
+  wc.lpfnWndProc = DefWindowProc;
+  wc.hInstance = hInstance;
+  wc.lpszClassName = class_name.c_str();
+
+  if (RegisterClass(&wc)) {
+    // Create hidden message-only window
+    HWND hwnd =
+        CreateWindow(class_name.c_str(), "NativeAPI Tray Icon", 0, 0, 0, 0, 0,
+                     HWND_MESSAGE,  // Message-only window
+                     nullptr, hInstance, nullptr);
+
+    if (hwnd) {
+      // Generate unique icon ID
+      static UINT next_icon_id = 1;
+      UINT icon_id = next_icon_id++;
+
+      // Reinitialize the Impl with the created window and icon ID
+      pimpl_ = std::make_unique<Impl>(hwnd, icon_id);
+    }
+  }
 }
 
 TrayIcon::TrayIcon(void* tray) : pimpl_(std::make_unique<Impl>()) {

src/platform/windows/tray_manager_windows.cpp

@@ -90,20 +90,9 @@ bool TrayManager::IsSupported() {
 std::shared_ptr<TrayIcon> TrayManager::Create() {
   std::lock_guard<std::mutex> lock(mutex_);
 
-  if (!pimpl_->hwnd_) {
-    std::cerr << "TrayManager: Hidden window not available" << std::endl;
-    return nullptr;
-  }
-
+  // Create tray icon with platform-specific initialization handled internally
   auto tray = std::make_shared<TrayIcon>();
   tray->id = next_tray_id_++;
-
-  // Windows-specific initialization is now handled internally by the TrayIcon
-  // implementation The platform-specific details are encapsulated within the
-  // PIMPL pattern
-  UINT icon_id = pimpl_->next_icon_id_++;
-  // Platform-specific setup is handled in the TrayIcon constructor and methods
-
   trays_[tray->id] = tray;
 
   return tray;

src/tray_icon.h

@@ -66,8 +66,9 @@ class TrayIcon : public EventEmitter, public NativeObjectProvider {
   /**
    * @brief Default constructor for TrayIcon.
    *
-   * Creates a new tray icon instance with default settings.
-   * The icon will not be visible until Show() is called.
+   * Creates a new tray icon instance with platform-specific initialization.
+   * The icon will not be visible until SetVisible(true) is called.
+   * This constructor handles all platform-specific setup internally.
    */
   TrayIcon();
 

src/tray_manager.h

@@ -55,8 +55,9 @@ class TrayManager {
   /**
    * @brief Create a new system tray icon.
    *
-   * Creates a new tray icon instance and registers it with the manager.
-   * The tray icon will be assigned a unique ID for future reference.
+   * Creates a new tray icon instance with platform-specific initialization
+   * and registers it with the manager. The tray icon will be assigned a
+   * unique ID for future reference.
    *
    * @return Shared pointer to the newly created TrayIcon instance
    * @note The returned tray icon is automatically managed by this TrayManager