Remove button info from tray icon click event

Refactored tray icon click event handling to no longer include button information. Updated event structures, callbacks, and related code on macOS and Windows to simplify the event payload and usage.

Author: lijy91

examples/tray_icon_c_example/main.c

@@ -33,8 +33,7 @@ void on_menu_item_clicked(const void* event, void* user_data) {
 void on_tray_clicked(const void* event, void* user_data) {
   const native_tray_icon_clicked_event_t* clicked_event =
       (const native_tray_icon_clicked_event_t*)event;
-  printf("Tray icon clicked! ID=%ld, Button='%s'\n",
-         clicked_event->tray_icon_id, clicked_event->button);
+  printf("Tray icon clicked! ID=%ld\n", clicked_event->tray_icon_id);
 }
 
 void on_tray_right_clicked(const void* event, void* user_data) {

src/capi/tray_icon_c.cpp

@@ -312,9 +312,6 @@ int native_tray_icon_add_listener(native_tray_icon_t tray_icon,
               if (listener_data && listener_data->callback) {
                 native_tray_icon_clicked_event_t c_event;
                 c_event.tray_icon_id = event.GetTrayIconId();
-                strncpy(c_event.button, event.GetButton().c_str(),
-                        sizeof(c_event.button) - 1);
-                c_event.button[sizeof(c_event.button) - 1] = '\0';
                 listener_data->callback(&c_event, listener_data->user_data);
               }
             });

src/capi/tray_icon_c.h

@@ -33,7 +33,6 @@ typedef long native_tray_icon_id_t;
  */
 typedef struct {
   native_tray_icon_id_t tray_icon_id;
-  char button[16];  // "left", "right", etc.
 } native_tray_icon_clicked_event_t;
 
 /**

src/platform/macos/tray_icon_macos.mm

@@ -13,7 +13,7 @@
 // for proper memory management of Objective-C objects.
 
 // Forward declarations
-typedef void (^TrayIconClickedBlock)(nativeapi::TrayIconId tray_icon_id, const std::string& button);
+typedef void (^TrayIconClickedBlock)(nativeapi::TrayIconId tray_icon_id);
 typedef void (^TrayIconRightClickedBlock)(nativeapi::TrayIconId tray_icon_id);
 typedef void (^TrayIconDoubleClickedBlock)(nativeapi::TrayIconId tray_icon_id);
 
@@ -133,14 +133,13 @@ - (void)statusItemClicked:(id)sender;
     pimpl_->ns_status_bar_button_target_.tray_icon = this;
 
     // 设置默认的 Block 处理器，直接发送事件
-    pimpl_->ns_status_bar_button_target_.leftClickedBlock =
-        ^(TrayIconId tray_icon_id, const std::string& button) {
-          try {
-            Emit<TrayIconClickedEvent>(tray_icon_id, button);
-          } catch (...) {
-            // Protect against event emission exceptions
-          }
-        };
+    pimpl_->ns_status_bar_button_target_.leftClickedBlock = ^(TrayIconId tray_icon_id) {
+      try {
+        Emit<TrayIconClickedEvent>(tray_icon_id);
+      } catch (...) {
+        // Protect against event emission exceptions
+      }
+    };
 
     pimpl_->ns_status_bar_button_target_.rightClickedBlock = ^(TrayIconId tray_icon_id) {
       try {
@@ -393,7 +392,7 @@ - (void)statusItemClicked:(id)sender {
       }
     } else {
       if (_leftClickedBlock) {
-        _leftClickedBlock(tray_icon->GetId(), "left");
+        _leftClickedBlock(tray_icon->GetId());
       }
     }
   }

src/platform/windows/menu_windows.cpp

@@ -2,6 +2,7 @@
 #include <memory>
 #include <optional>
 #include <vector>
+#include <iostream>
 #include "../../foundation/id_allocator.h"
 #include "../../image.h"
 #include "../../menu.h"
@@ -85,6 +86,71 @@ std::pair<UINT, UINT> ConvertAccelerator(
   return std::make_pair(key, modifiers);
 }
 
+// Helper function to get the main window for the current thread
+HWND GetMainWindowForCurrentThread() {
+  static HWND main_window = nullptr;
+
+  // First try to get the foreground window
+  HWND hwnd = nullptr;
+
+
+  // Use EnumWindows to find the main window
+  struct EnumData {
+    HWND main_window;
+    DWORD current_thread_id;
+  };
+
+  EnumData data = {nullptr, GetCurrentThreadId()};
+
+  EnumWindows(
+      [](HWND hwnd, LPARAM lParam) -> BOOL {
+        EnumData* data = reinterpret_cast<EnumData*>(lParam);
+
+        // Check if window belongs to current thread
+        DWORD window_thread_id = GetWindowThreadProcessId(hwnd, nullptr);
+        if (window_thread_id != data->current_thread_id) {
+          return TRUE;  // Continue enumeration
+        }
+
+        // Check if window is visible and not a tool window
+        if (!IsWindowVisible(hwnd)) {
+          return TRUE;  // Continue enumeration
+        }
+
+        // Skip tool windows
+        if (GetWindowLong(hwnd, GWL_EXSTYLE) & WS_EX_TOOLWINDOW) {
+          return TRUE;  // Continue enumeration
+        }
+
+        // Skip message-only windows
+        if (hwnd == HWND_MESSAGE) {
+          return TRUE;  // Continue enumeration
+        }
+
+        // Check if it's a main window (has a title bar, not a child window)
+        if (GetParent(hwnd) != nullptr) {
+          return TRUE;  // Continue enumeration
+        }
+
+        // Found a candidate main window
+        data->main_window = hwnd;
+        return FALSE;  // Stop enumeration
+      },
+      reinterpret_cast<LPARAM>(&data));
+
+  if (data.main_window) {
+    return data.main_window;
+  }
+
+  // Fallback: try to find any top-level window
+  hwnd = FindWindow(nullptr, nullptr);
+  if (hwnd && IsWindow(hwnd)) {
+    return hwnd;
+  }
+
+  return nullptr;
+}
+
 }  // namespace nativeapi
 
 namespace nativeapi {
@@ -485,17 +551,8 @@ bool Menu::Open(double x, double y) {
   pimpl_->visible_ = true;
 
   POINT pt = {static_cast<int>(x), static_cast<int>(y)};
-  // Try to get the foreground window first
-  HWND hwnd = GetForegroundWindow();
-  if (!hwnd) {
-    hwnd = GetActiveWindow();
-    return hwnd;
-  }
-
-  // If still no window, try to find any top-level window
-  if (!hwnd) {
-    hwnd = FindWindow(nullptr, nullptr);
-  }
+  // Use the helper function to get the main window for current thread
+  HWND hwnd = GetMainWindowForCurrentThread();
 
   // Show the context menu
   TrackPopupMenu(pimpl_->hmenu_, TPM_BOTTOMALIGN | TPM_LEFTALIGN, pt.x, pt.y, 0,

src/platform/windows/tray_icon_windows.cpp

@@ -29,7 +29,7 @@ class TrayIcon::Impl {
   std::shared_ptr<Image> image_;
 
   // Callback function types
-  using ClickedCallback = std::function<void(TrayIconId, const std::string&)>;
+  using ClickedCallback = std::function<void(TrayIconId)>;
   using RightClickedCallback = std::function<void(TrayIconId)>;
   using DoubleClickedCallback = std::function<void(TrayIconId)>;
 
@@ -91,7 +91,7 @@ class TrayIcon::Impl {
                   << std::endl;
         // Call clicked callback
         if (clicked_callback_) {
-          clicked_callback_(tray_icon_id_, "left");
+          clicked_callback_(tray_icon_id_);
         }
       } else if (lparam == WM_RBUTTONUP) {
         std::cout << "TrayIcon: Right button clicked, tray_icon_id = " << tray_icon_id_
@@ -180,8 +180,8 @@ TrayIcon::TrayIcon(void* native_tray_icon) {
   // The tray_icon_id will be allocated inside Impl constructor
   if (hwnd) {
     // Create callback functions that emit events
-    auto clicked_callback = [this](TrayIconId id, const std::string& button) {
-      this->Emit<TrayIconClickedEvent>(id, button);
+    auto clicked_callback = [this](TrayIconId id) {
+      this->Emit<TrayIconClickedEvent>(id);
     };
 
     auto right_clicked_callback = [this](TrayIconId id) {

src/tray_icon_event.h

@@ -28,17 +28,15 @@ class TrayIconEvent : public Event {
  */
 class TrayIconClickedEvent : public TrayIconEvent {
  public:
-  TrayIconClickedEvent(TrayIconId tray_icon_id, const std::string& button)
-      : tray_icon_id_(tray_icon_id), button_(button) {}
+  TrayIconClickedEvent(TrayIconId tray_icon_id)
+      : tray_icon_id_(tray_icon_id) {}
 
   TrayIconId GetTrayIconId() const { return tray_icon_id_; }
-  const std::string& GetButton() const { return button_; }
 
   std::string GetTypeName() const override { return "TrayIconClickedEvent"; }
 
  private:
   TrayIconId tray_icon_id_;
-  std::string button_;
 };
 
 /**