Refactor tray icon ID type to use IdAllocator

Replaces the TrayIconID typedef (long) with TrayIconId based on IdAllocator::IdType across all platforms and related event classes. Updates method signatures, member variables, and event constructors for consistency and type safety. Minor formatting and whitespace improvements applied in several files.

Author: lijy91

src/foundation/id_allocator.cpp

@@ -31,10 +31,10 @@ uint32_t IdAllocator::GetSequence(IdType id) {
 bool IdAllocator::IsValid(IdType id) {
   // Extract type value from high 8 bits
   const uint32_t type_value = (id & kTypeMask) >> kTypeShift;
-  
+
   // Extract sequence number from low 24 bits
   const uint32_t seq = id & kSequenceMask;
-  
+
   // ID is valid if:
   // 1. Type value is in valid range [kMinTypeValue, kMaxTypeValue] (1-10)
   // 2. Sequence number is non-zero (0 is reserved for kInvalidId)
@@ -47,10 +47,10 @@ bool IdAllocator::IsValid(IdType id) {
 std::pair<uint32_t, uint32_t> IdAllocator::Decompose(IdType id) {
   // Extract type value from high 8 bits (bits 31-24)
   const uint32_t type_value = (id & kTypeMask) >> kTypeShift;
-  
+
   // Extract sequence number from low 24 bits (bits 23-0)
   const uint32_t sequence = id & kSequenceMask;
-  
+
   // Return both components as a pair
   return {type_value, sequence};
 }

src/foundation/id_allocator.h

@@ -44,12 +44,9 @@ class IdAllocator {
   /// Bit layout specification: [ type:8 | sequence:24 ]
   /// High 8 bits store the type identifier, low 24 bits store the sequence
   /// number
-  static constexpr uint32_t kTypeBits =
-      8;  ///< Number of bits allocated for type information
-  static constexpr uint32_t kSequenceBits =
-      24;  ///< Number of bits allocated for sequence numbers
-  static constexpr uint32_t kTypeShift =
-      24;  ///< Bit shift amount to extract type from ID
+  static constexpr uint32_t kTypeBits = 8;       ///< Number of bits allocated for type information
+  static constexpr uint32_t kSequenceBits = 24;  ///< Number of bits allocated for sequence numbers
+  static constexpr uint32_t kTypeShift = 24;     ///< Bit shift amount to extract type from ID
   static constexpr uint32_t kTypeMask =
       0xFF000000u;  ///< Bit mask to extract type bits (high 8 bits)
   static constexpr uint32_t kSequenceMask =
@@ -91,8 +88,7 @@ class IdAllocator {
     // once
     static uint32_t type_value = []() {
       // Atomically get the next available type value
-      uint32_t value =
-          GetNextTypeCounter().fetch_add(1, std::memory_order_relaxed);
+      uint32_t value = GetNextTypeCounter().fetch_add(1, std::memory_order_relaxed);
       if (value > kMaxTypeValue) {
         // Handle overflow - this shouldn't happen in practice with only 10
         // types but provides safety in case of programming errors
@@ -120,8 +116,7 @@ class IdAllocator {
     // Using relaxed memory ordering is safe here because we only need
     // atomicity, not ordering guarantees between different operations. This
     // provides optimal performance while maintaining thread safety.
-    uint32_t sequence =
-        GetCounter<T>().fetch_add(1, std::memory_order_relaxed) + 1u;
+    uint32_t sequence = GetCounter<T>().fetch_add(1, std::memory_order_relaxed) + 1u;
 
     // Check for overflow: if sequence wraps around to 0 in the low 24 bits,
     // treat as allocation failure to avoid returning kInvalidId

src/platform/linux/menu_linux.cpp

@@ -85,8 +85,8 @@ MenuItem::MenuItem(void* menu_item)
     : id(g_next_menu_item_id++),
       pimpl_(new Impl((GtkWidget*)menu_item, MenuItemType::Normal)) {
   if (pimpl_->gtk_menu_item_ && pimpl_->type_ != MenuItemType::Separator) {
-    const char* label = gtk_menu_item_get_label(
-        GTK_MENU_ITEM(pimpl_->gtk_menu_item_));
+    const char* label =
+        gtk_menu_item_get_label(GTK_MENU_ITEM(pimpl_->gtk_menu_item_));
     if (label && label[0] != '\0') {
       pimpl_->title_ = std::string(label);
     } else {

src/platform/linux/tray_manager_linux.cpp

@@ -62,7 +62,7 @@ bool TrayManager::IsSupported() {
 #endif
 }
 
-std::shared_ptr<TrayIcon> TrayManager::Get(TrayIconID id) {
+std::shared_ptr<TrayIcon> TrayManager::Get(TrayIconId id) {
   std::lock_guard<std::mutex> lock(mutex_);
 
   auto it = trays_.find(id);

src/platform/macos/tray_icon_macos.mm

@@ -1,3 +1,4 @@
+#include <optional>
 #include "../../foundation/geometry.h"
 #include "../../menu.h"
 #include "../../tray_icon.h"
@@ -10,9 +11,9 @@
 // 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);
+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 NSStatusBarButtonTarget : NSObject
 @property(nonatomic, assign) nativeapi::TrayIcon* trayIcon;
@@ -86,76 +87,46 @@ - (void)statusItemClicked:(id)sender;
   size_t menu_closed_listener_id_;
 };
 
-TrayIcon::TrayIcon() {
-  id = -1;
-
-  // Create platform-specific NSStatusItem
-  NSStatusBar* status_bar = [NSStatusBar systemStatusBar];
-  NSStatusItem* status_item = [status_bar statusItemWithLength:NSVariableStatusItemLength];
-
-  if (status_item) {
-    // Initialize the Impl with the created status item
-    pimpl_ = std::make_unique<Impl>(status_item);
-
-    if (pimpl_->ns_status_bar_button_target_) {
-      pimpl_->ns_status_bar_button_target_.trayIcon = this;
-
-      // 设置默认的 Block 处理器，直接发送事件
-      pimpl_->ns_status_bar_button_target_.leftClickedBlock =
-          ^(TrayIconID tray_icon_id, const std::string& button) {
-            try {
-              EmitSync<TrayIconClickedEvent>(tray_icon_id, button);
-            } catch (...) {
-              // Protect against event emission exceptions
-            }
-          };
-
-      pimpl_->ns_status_bar_button_target_.rightClickedBlock = ^(TrayIconID tray_icon_id) {
-        try {
-          EmitSync<TrayIconRightClickedEvent>(tray_icon_id);
-        } catch (...) {
-          // Protect against event emission exceptions
-        }
-      };
-
-      pimpl_->ns_status_bar_button_target_.doubleClickedBlock = ^(TrayIconID tray_icon_id) {
-        try {
-          EmitSync<TrayIconDoubleClickedEvent>(tray_icon_id);
-        } catch (...) {
-          // Protect against event emission exceptions
-        }
-      };
-    }
+TrayIcon::TrayIcon() : TrayIcon(nullptr) {}
+
+TrayIcon::TrayIcon(void* tray) {
+  id = IdAllocator::Allocate<TrayIcon>();
+
+  NSStatusItem* status_item = nullptr;
+
+  if (tray == nullptr) {
+    // Create platform-specific NSStatusItem
+    NSStatusBar* status_bar = [NSStatusBar systemStatusBar];
+    status_item = [status_bar statusItemWithLength:NSVariableStatusItemLength];
   } else {
-    // If status_item creation failed, create Impl with nil
-    pimpl_ = std::make_unique<Impl>(nil);
+    status_item = (__bridge NSStatusItem*)tray;
   }
-}
 
-TrayIcon::TrayIcon(void* tray) : pimpl_(std::make_unique<Impl>((__bridge NSStatusItem*)tray)) {
-  id = -1;  // Will be set by TrayManager when created
+  // Initialize the Impl with the status item
+  pimpl_ = std::make_unique<Impl>(status_item);
+
   if (pimpl_->ns_status_bar_button_target_) {
     pimpl_->ns_status_bar_button_target_.trayIcon = this;
 
     // 设置默认的 Block 处理器，直接发送事件
     pimpl_->ns_status_bar_button_target_.leftClickedBlock =
-        ^(TrayIconID tray_icon_id, const std::string& button) {
+        ^(TrayIconId tray_icon_id, const std::string& button) {
           try {
             EmitSync<TrayIconClickedEvent>(tray_icon_id, button);
           } catch (...) {
             // Protect against event emission exceptions
           }
         };
 
-    pimpl_->ns_status_bar_button_target_.rightClickedBlock = ^(TrayIconID tray_icon_id) {
+    pimpl_->ns_status_bar_button_target_.rightClickedBlock = ^(TrayIconId tray_icon_id) {
       try {
         EmitSync<TrayIconRightClickedEvent>(tray_icon_id);
       } catch (...) {
         // Protect against event emission exceptions
       }
     };
 
-    pimpl_->ns_status_bar_button_target_.doubleClickedBlock = ^(TrayIconID tray_icon_id) {
+    pimpl_->ns_status_bar_button_target_.doubleClickedBlock = ^(TrayIconId tray_icon_id) {
       try {
         EmitSync<TrayIconDoubleClickedEvent>(tray_icon_id);
       } catch (...) {

src/platform/macos/tray_manager_macos.mm

@@ -56,7 +56,7 @@
   return true;
 }
 
-std::shared_ptr<TrayIcon> TrayManager::Get(TrayIconID id) {
+std::shared_ptr<TrayIcon> TrayManager::Get(TrayIconId id) {
   std::lock_guard<std::mutex> lock(mutex_);
 
   auto it = trays_.find(id);

src/platform/windows/menu_windows.cpp

@@ -13,7 +13,6 @@ namespace nativeapi {
 static std::atomic<MenuItemID> g_next_menu_item_id{1};
 static std::atomic<MenuID> g_next_menu_id{1};
 
-
 // Helper function to convert KeyboardAccelerator to Windows accelerator
 std::pair<UINT, UINT> ConvertAccelerator(
     const KeyboardAccelerator& accelerator) {
@@ -127,20 +126,17 @@ class MenuItem::Impl {
   }
 };
 
-
 MenuItem::MenuItem(void* native_item)
     : id(g_next_menu_item_id++),
-      pimpl_(std::make_unique<Impl>(nullptr, 0, MenuItemType::Normal)) {
-}
+      pimpl_(std::make_unique<Impl>(nullptr, 0, MenuItemType::Normal)) {}
 
 MenuItem::MenuItem(const std::string& text, MenuItemType type)
     : id(g_next_menu_item_id++),
       pimpl_(std::make_unique<Impl>(nullptr, 0, type)) {
   pimpl_->text_ = text;
 }
 
-MenuItem::~MenuItem() {
-}
+MenuItem::~MenuItem() {}
 
 MenuItemType MenuItem::GetType() const {
   return pimpl_->type_;
@@ -320,18 +316,14 @@ class Menu::Impl {
   }
 };
 
-
 Menu::Menu(void* native_menu)
     : id(g_next_menu_id++),
-      pimpl_(std::make_unique<Impl>(static_cast<HMENU>(native_menu))) {
-}
+      pimpl_(std::make_unique<Impl>(static_cast<HMENU>(native_menu))) {}
 
-Menu::Menu() : id(g_next_menu_id++),
-               pimpl_(std::make_unique<Impl>(CreatePopupMenu())) {
-}
+Menu::Menu()
+    : id(g_next_menu_id++), pimpl_(std::make_unique<Impl>(CreatePopupMenu())) {}
 
-Menu::~Menu() {
-}
+Menu::~Menu() {}
 
 void Menu::AddItem(std::shared_ptr<MenuItem> item) {
   if (!item)

src/platform/windows/string_utils_windows.h

@@ -9,8 +9,9 @@ namespace {  // Anonymous namespace, visible only within the translation unit in
 
 // Convert std::string (UTF-8) to std::wstring (UTF-16)
 inline std::wstring StringToWString(const std::string& str) {
-  if (str.empty()) return std::wstring();
-  
+  if (str.empty())
+    return std::wstring();
+
   int size_needed = MultiByteToWideChar(CP_UTF8, 0, str.c_str(), (int)str.size(), nullptr, 0);
   std::wstring wstr(size_needed, 0);
   MultiByteToWideChar(CP_UTF8, 0, str.c_str(), (int)str.size(), &wstr[0], size_needed);
@@ -19,22 +20,25 @@ inline std::wstring StringToWString(const std::string& str) {
 
 // Convert std::wstring (UTF-16) to std::string (UTF-8)
 inline std::string WStringToString(const std::wstring& wstr) {
-  if (wstr.empty()) return std::string();
-  
-  int size_needed = WideCharToMultiByte(CP_UTF8, 0, wstr.c_str(), (int)wstr.size(), nullptr, 0, nullptr, nullptr);
+  if (wstr.empty())
+    return std::string();
+
+  int size_needed =
+      WideCharToMultiByte(CP_UTF8, 0, wstr.c_str(), (int)wstr.size(), nullptr, 0, nullptr, nullptr);
   std::string str(size_needed, 0);
-  WideCharToMultiByte(CP_UTF8, 0, wstr.c_str(), (int)wstr.size(), &str[0], size_needed, nullptr, nullptr);
+  WideCharToMultiByte(CP_UTF8, 0, wstr.c_str(), (int)wstr.size(), &str[0], size_needed, nullptr,
+                      nullptr);
   return str;
 }
 
 // Convert WCHAR array to std::string
 inline std::string WCharArrayToString(const WCHAR* wchar_array) {
-  if (!wchar_array) return std::string();
+  if (!wchar_array)
+    return std::string();
   return WStringToString(std::wstring(wchar_array));
 }
 
 }  // anonymous namespace
 }  // namespace nativeapi
 
 #endif  // NATIVEAPI_PLATFORM_WINDOWS_STRING_UTILS_H_
-

src/platform/windows/tray_icon_windows.cpp

@@ -1,5 +1,5 @@
-#include <windows.h>
 #include <shellapi.h>
+#include <windows.h>
 #include <memory>
 #include <string>
 
@@ -14,8 +14,7 @@ namespace nativeapi {
 // Private implementation class
 class TrayIcon::Impl {
  public:
-  Impl()
-      : hwnd_(nullptr), icon_id_(0), icon_handle_(nullptr) {}
+  Impl() : hwnd_(nullptr), icon_id_(0), icon_handle_(nullptr) {}
 
   Impl(HWND hwnd, UINT icon_id)
       : hwnd_(hwnd), icon_id_(icon_id), icon_handle_(nullptr) {
@@ -199,7 +198,7 @@ void TrayIcon::SetTooltip(std::optional<std::string> tooltip) {
   if (pimpl_->hwnd_) {
     std::string tooltip_str = tooltip.has_value() ? *tooltip : "";
     std::wstring wtooltip = StringToWString(tooltip_str);
-    wcsncpy_s(pimpl_->nid_.szTip, _countof(pimpl_->nid_.szTip), 
+    wcsncpy_s(pimpl_->nid_.szTip, _countof(pimpl_->nid_.szTip),
               wtooltip.c_str(), _TRUNCATE);
 
     // Update if icon is visible (check if hIcon is set as indicator)

src/platform/windows/tray_manager_windows.cpp

@@ -6,14 +6,16 @@
 
 namespace nativeapi {
 
-// Define the Impl class for Windows (empty for now, as Windows doesn't need platform-specific data)
+// Define the Impl class for Windows (empty for now, as Windows doesn't need
+// platform-specific data)
 class TrayManager::Impl {
  public:
   Impl() {}
   ~Impl() {}
 };
 
-TrayManager::TrayManager() : pimpl_(std::make_unique<Impl>()), next_tray_id_(1) {}
+TrayManager::TrayManager()
+    : pimpl_(std::make_unique<Impl>()), next_tray_id_(1) {}
 
 TrayManager::~TrayManager() {
   std::lock_guard<std::mutex> lock(mutex_);
@@ -31,7 +33,7 @@ bool TrayManager::IsSupported() {
   return true;  // Windows always supports system tray
 }
 
-std::shared_ptr<TrayIcon> TrayManager::Get(TrayIconID id) {
+std::shared_ptr<TrayIcon> TrayManager::Get(TrayIconId id) {
   std::lock_guard<std::mutex> lock(mutex_);
 
   auto it = trays_.find(id);
@@ -51,4 +53,4 @@ std::vector<std::shared_ptr<TrayIcon>> TrayManager::GetAll() {
   return trays;
 }
 
-}  // namespace nativeapi
+}  // namespace nativeapi