Refactor menu and menu item ID accessors, remove FindItemByText

Replaces direct access to menu and menu item IDs with GetId() accessor methods across all platforms. Removes the FindItemByText method and related C API, cleaning up unused code and simplifying the menu interface.

Author: lijy91

examples/menu_example/main.cpp

@@ -12,7 +12,7 @@ int main() {
   try {
     // Create a menu
     auto menu = std::make_shared<Menu>();
-    std::cout << "Created menu with ID: " << menu->id << std::endl;
+    std::cout << "Created menu with ID: " << menu->GetId() << std::endl;
 
     // Create menu items with different types
     auto file_item =

examples/tray_icon_c_example/main.c

@@ -202,23 +202,6 @@ int main() {
            bounds.x, bounds.y, bounds.width, bounds.height);
   }
 
-  // Demonstrate menu item lookup
-  native_menu_item_t found_item = native_menu_find_item_by_text(menu, "Exit");
-  if (found_item) {
-    printf("Found 'Exit' menu item with ID: %ld\n",
-           native_menu_item_get_id(found_item));
-
-    // Get accelerator info
-    native_keyboard_accelerator_t accel;
-    if (native_menu_item_get_accelerator(found_item, &accel)) {
-      char* accel_str = native_keyboard_accelerator_to_string(&accel);
-      if (accel_str) {
-        printf("Exit item accelerator: %s\n", accel_str);
-        free_c_str(accel_str);  // Free the allocated string
-      }
-    }
-  }
-
   // Show all managed tray icons
   native_tray_icon_list_t tray_list = native_tray_manager_get_all();
   printf("Total managed tray icons: %zu\n", tray_list.count);

src/capi/menu_c.cpp

@@ -198,7 +198,7 @@ native_menu_item_id_t native_menu_item_get_id(native_menu_item_t item) {
 
   try {
     auto menu_item = static_cast<MenuItem*>(item);
-    return menu_item->id;
+    return menu_item->GetId();
   } catch (...) {
     return -1;
   }
@@ -688,7 +688,7 @@ native_menu_id_t native_menu_get_id(native_menu_t menu) {
 
   try {
     auto menu_ptr = static_cast<Menu*>(menu);
-    return menu_ptr->id;
+    return menu_ptr->GetId();
   } catch (...) {
     return -1;
   }
@@ -893,20 +893,6 @@ native_menu_item_list_t native_menu_get_all_items(native_menu_t menu) {
   }
 }
 
-native_menu_item_t native_menu_find_item_by_text(native_menu_t menu,
-                                                 const char* text) {
-  if (!menu || !text)
-    return nullptr;
-
-  try {
-    auto menu_ptr = static_cast<Menu*>(menu);
-    auto item = menu_ptr->FindItemByText(text);
-    return item ? static_cast<native_menu_item_t>(item.get()) : nullptr;
-  } catch (...) {
-    return nullptr;
-  }
-}
-
 bool native_menu_open_at(native_menu_t menu, double x, double y) {
   if (!menu)
     return false;

src/capi/menu_c.h

@@ -497,15 +497,6 @@ native_menu_item_t native_menu_get_item_by_id(native_menu_t menu, native_menu_it
 FFI_PLUGIN_EXPORT
 native_menu_item_list_t native_menu_get_all_items(native_menu_t menu);
 
-/**
- * Find a menu item by text
- * @param menu The menu
- * @param text The text to search for
- * @return The first menu item with matching text, or NULL if not found
- */
-FFI_PLUGIN_EXPORT
-native_menu_item_t native_menu_find_item_by_text(native_menu_t menu, const char* text);
-
 /**
  * Open the menu as a context menu at specified coordinates
  * @param menu The menu

src/menu.h

@@ -214,12 +214,14 @@ class MenuItem : public EventEmitter<MenuEvent>, public NativeObjectProvider {
   virtual ~MenuItem();
 
   /**
-   * @brief Unique identifier for this menu item.
+   * @brief Get the unique identifier for this menu item.
    *
    * This ID is assigned when the item is created and can be used to
    * reference the item in event handlers and other operations.
+   *
+   * @return The unique identifier for this menu item
    */
-  MenuItemId id;
+  MenuItemId GetId() const;
 
   /**
    * @brief Get the type of this menu item.
@@ -540,12 +542,14 @@ class Menu : public EventEmitter<MenuEvent>, public NativeObjectProvider {
   virtual ~Menu();
 
   /**
-   * @brief Unique identifier for this menu.
+   * @brief Get the unique identifier for this menu.
    *
    * This ID is assigned when the menu is created and can be used to
    * reference the menu in various operations.
+   *
+   * @return The unique identifier for this menu
    */
-  MenuId id;
+  MenuId GetId() const;
 
   /**
    * @brief Add a menu item to the end of the menu.
@@ -663,18 +667,6 @@ class Menu : public EventEmitter<MenuEvent>, public NativeObjectProvider {
    */
   std::vector<std::shared_ptr<MenuItem>> GetAllItems() const;
 
-  /**
-   * @brief Find a menu item by its text.
-   *
-   * Searches for the first menu item with matching text.
-   *
-   * @param text The text to search for
-   * @param case_sensitive Whether the search should be case-sensitive
-   * @return Shared pointer to the menu item, or nullptr if not found
-   */
-  std::shared_ptr<MenuItem> FindItemByText(const std::string& text,
-                                           bool case_sensitive = true) const;
-
   /**
    * @brief Display the menu as a context menu at the specified screen
    * coordinates.

src/platform/linux/menu_linux.cpp

@@ -23,23 +23,23 @@ static void OnGtkMenuItemActivate(GtkMenuItem* /*item*/, gpointer user_data) {
   if (auto label = menu_item->GetLabel(); label.has_value()) {
     text = *label;
   }
-  menu_item->Emit(MenuItemClickedEvent(menu_item->id, text));
+  menu_item->Emit(MenuItemClickedEvent(menu_item->GetId(), text));
 }
 
 static void OnGtkMenuShow(GtkWidget* /*menu*/, gpointer user_data) {
   Menu* menu_obj = static_cast<Menu*>(user_data);
   if (!menu_obj) {
     return;
   }
-  menu_obj->Emit(MenuOpenedEvent(menu_obj->id));
+  menu_obj->Emit(MenuOpenedEvent(menu_obj->GetId()));
 }
 
 static void OnGtkMenuHide(GtkWidget* /*menu*/, gpointer user_data) {
   Menu* menu_obj = static_cast<Menu*>(user_data);
   if (!menu_obj) {
     return;
   }
-  menu_obj->Emit(MenuClosedEvent(menu_obj->id));
+  menu_obj->Emit(MenuClosedEvent(menu_obj->GetId()));
 }
 
 static void OnGtkSubmenuShow(GtkWidget* /*submenu*/, gpointer user_data) {
@@ -48,7 +48,7 @@ static void OnGtkSubmenuShow(GtkWidget* /*submenu*/, gpointer user_data) {
     return;
   }
   // Emit submenu opened on the item
-  menu_item->Emit(MenuItemSubmenuOpenedEvent(menu_item->id));
+  menu_item->Emit(MenuItemSubmenuOpenedEvent(menu_item->GetId()));
 }
 
 static void OnGtkSubmenuHide(GtkWidget* /*submenu*/, gpointer user_data) {
@@ -57,14 +57,15 @@ static void OnGtkSubmenuHide(GtkWidget* /*submenu*/, gpointer user_data) {
     return;
   }
   // Emit submenu closed on the item
-  menu_item->Emit(MenuItemSubmenuClosedEvent(menu_item->id));
+  menu_item->Emit(MenuItemSubmenuClosedEvent(menu_item->GetId()));
 }
 
 // Private implementation class for MenuItem
 class MenuItem::Impl {
  public:
-  Impl(GtkWidget* menu_item, MenuItemType type)
-      : gtk_menu_item_(menu_item),
+  Impl(MenuItemId id, GtkWidget* menu_item, MenuItemType type)
+      : id_(id),
+        gtk_menu_item_(menu_item),
         title_(""),
         tooltip_(""),
         type_(type),
@@ -74,6 +75,7 @@ class MenuItem::Impl {
         radio_group_(-1),
         accelerator_("", KeyboardAccelerator::None) {}
 
+  MenuItemId id_;
   GtkWidget* gtk_menu_item_;
   std::optional<std::string> title_;
   std::shared_ptr<Image> image_;
@@ -87,8 +89,8 @@ class MenuItem::Impl {
   std::shared_ptr<Menu> submenu_;
 };
 
-MenuItem::MenuItem(const std::string& text, MenuItemType type)
-    : id(IdAllocator::Allocate<MenuItem>()) {
+MenuItem::MenuItem(const std::string& text, MenuItemType type) {
+  MenuItemId id = IdAllocator::Allocate<MenuItem>();
   GtkWidget* gtk_item = nullptr;
 
   switch (type) {
@@ -108,7 +110,7 @@ MenuItem::MenuItem(const std::string& text, MenuItemType type)
       break;
   }
 
-  pimpl_ = std::unique_ptr<Impl>(new Impl(gtk_item, type));
+  pimpl_ = std::unique_ptr<Impl>(new Impl(id, gtk_item, type));
 
   if (!text.empty()) {
     pimpl_->title_ = text;
@@ -123,9 +125,9 @@ MenuItem::MenuItem(const std::string& text, MenuItemType type)
   }
 }
 
-MenuItem::MenuItem(void* menu_item)
-    : id(IdAllocator::Allocate<MenuItem>()),
-      pimpl_(new Impl((GtkWidget*)menu_item, MenuItemType::Normal)) {
+MenuItem::MenuItem(void* menu_item) {
+  MenuItemId id = IdAllocator::Allocate<MenuItem>();
+  pimpl_ = std::unique_ptr<Impl>(new Impl(id, (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_));
@@ -144,6 +146,10 @@ MenuItem::MenuItem(void* menu_item)
 
 MenuItem::~MenuItem() {}
 
+MenuItemId MenuItem::GetId() const {
+  return pimpl_->id_;
+}
+
 MenuItemType MenuItem::GetType() const {
   return pimpl_->type_;
 }
@@ -294,17 +300,18 @@ void* MenuItem::GetNativeObjectInternal() const {
 // Private implementation class for Menu
 class Menu::Impl {
  public:
-  Impl(GtkWidget* menu) : gtk_menu_(menu), enabled_(true), visible_(false) {}
+  Impl(MenuId id, GtkWidget* menu) : id_(id), gtk_menu_(menu), enabled_(true), visible_(false) {}
 
+  MenuId id_;
   GtkWidget* gtk_menu_;
   std::vector<std::shared_ptr<MenuItem>> items_;
   bool enabled_;
   bool visible_;
 };
 
-Menu::Menu()
-    : id(IdAllocator::Allocate<Menu>()),
-      pimpl_(std::unique_ptr<Impl>(new Impl(gtk_menu_new()))) {
+Menu::Menu() {
+  MenuId id = IdAllocator::Allocate<Menu>();
+  pimpl_ = std::unique_ptr<Impl>(new Impl(id, gtk_menu_new()));
   // Connect menu show/hide to emit open/close events
   if (pimpl_->gtk_menu_) {
     g_signal_connect(G_OBJECT(pimpl_->gtk_menu_), "show",
@@ -314,8 +321,9 @@ Menu::Menu()
   }
 }
 
-Menu::Menu(void* menu)
-    : id(IdAllocator::Allocate<Menu>()), pimpl_(new Impl((GtkWidget*)menu)) {
+Menu::Menu(void* menu) {
+  MenuId id = IdAllocator::Allocate<Menu>();
+  pimpl_ = std::unique_ptr<Impl>(new Impl(id, (GtkWidget*)menu));
   if (pimpl_->gtk_menu_) {
     g_signal_connect(G_OBJECT(pimpl_->gtk_menu_), "show",
                      G_CALLBACK(OnGtkMenuShow), this);
@@ -330,6 +338,10 @@ Menu::~Menu() {
   }
 }
 
+MenuId Menu::GetId() const {
+  return pimpl_->id_;
+}
+
 void Menu::AddItem(std::shared_ptr<MenuItem> item) {
   if (pimpl_->gtk_menu_ && item && item->GetNativeObject()) {
     pimpl_->items_.push_back(item);
@@ -369,7 +381,7 @@ bool Menu::RemoveItem(std::shared_ptr<MenuItem> item) {
 
 bool Menu::RemoveItemById(MenuItemId item_id) {
   for (auto& item : pimpl_->items_) {
-    if (item->id == item_id) {
+    if (item->GetId() == item_id) {
       return RemoveItem(item);
     }
   }
@@ -413,7 +425,7 @@ std::shared_ptr<MenuItem> Menu::GetItemAt(size_t index) const {
 
 std::shared_ptr<MenuItem> Menu::GetItemById(MenuItemId item_id) const {
   for (const auto& item : pimpl_->items_) {
-    if (item->id == item_id) {
+    if (item->GetId() == item_id) {
       return item;
     }
   }
@@ -424,34 +436,6 @@ std::vector<std::shared_ptr<MenuItem>> Menu::GetAllItems() const {
   return pimpl_->items_;
 }
 
-std::shared_ptr<MenuItem> Menu::FindItemByText(const std::string& text,
-                                               bool case_sensitive) const {
-  for (const auto& item : pimpl_->items_) {
-    auto itemTextOpt = item->GetLabel();
-    if (!itemTextOpt.has_value()) {
-      continue;
-    }
-
-    const std::string& item_text = itemTextOpt.value();
-    if (case_sensitive) {
-      if (item_text == text) {
-        return item;
-      }
-    } else {
-      std::string lower_item_text = item_text;
-      std::string lower_search_text = text;
-      std::transform(lower_item_text.begin(), lower_item_text.end(),
-                     lower_item_text.begin(), ::tolower);
-      std::transform(lower_search_text.begin(), lower_search_text.end(),
-                     lower_search_text.begin(), ::tolower);
-      if (lower_item_text == lower_search_text) {
-        return item;
-      }
-    }
-  }
-  return nullptr;
-}
-
 bool Menu::Open(double x, double y) {
   if (pimpl_->gtk_menu_) {
     pimpl_->visible_ = true;