Refactor MenuItem and TrayIcon constructors to use std::optional for title and tooltip

Author: lijy91

src/platform/linux/menu_linux.cpp

@@ -48,9 +48,8 @@ class MenuItem::Impl {
   std::shared_ptr<Menu> submenu_;
 };
 
-// MenuItem static factory methods
-std::shared_ptr<MenuItem> MenuItem::Create(const std::string& text,
-                                           MenuItemType type) {
+MenuItem::MenuItem(const std::string& text, MenuItemType type)
+    : id(g_next_menu_item_id++) {
   GtkWidget* gtk_item = nullptr;
 
   switch (type) {
@@ -70,28 +69,30 @@ std::shared_ptr<MenuItem> MenuItem::Create(const std::string& text,
       break;
   }
 
-  auto item = std::shared_ptr<MenuItem>(new MenuItem(text, type));
-  item->pimpl_ = std::unique_ptr<Impl>(new Impl(gtk_item, type));
-  item->id = g_next_menu_item_id++;
-  item->pimpl_->title_ = text;
+  pimpl_ = std::unique_ptr<Impl>(new Impl(gtk_item, type));
 
-  // Register the MenuItem for event emission
-  g_menu_item_registry[item->id] = item.get();
-
-  return item;
-}
-
-std::shared_ptr<MenuItem> MenuItem::CreateSeparator() {
-  return Create("", MenuItemType::Separator);
-}
+  if (!text.empty()) {
+    pimpl_->title_ = text;
+  } else {
+    pimpl_->title_.reset();
+  }
 
-MenuItem::MenuItem(const std::string& text, MenuItemType type) : id(0) {
-  // Constructor body - id will be set in Create method
+  // Register the MenuItem for event emission
+  g_menu_item_registry[id] = this;
 }
 
 MenuItem::MenuItem(void* menu_item)
-    : pimpl_(new Impl((GtkWidget*)menu_item, MenuItemType::Normal)) {
-  id = g_next_menu_item_id++;
+    : 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_));
+    if (label && label[0] != '\0') {
+      pimpl_->title_ = std::string(label);
+    } else {
+      pimpl_->title_.reset();
+    }
+  }
   g_menu_item_registry[id] = this;
 }
 
@@ -236,14 +237,6 @@ void* MenuItem::GetNativeObjectInternal() const {
   return (void*)pimpl_->gtk_menu_item_;
 }
 
-void MenuItem::EmitSelectedEvent(const std::string& item_text) {
-  // TODO: Implement event emission for GTK
-}
-
-void MenuItem::EmitStateChangedEvent(bool checked) {
-  // TODO: Implement state change event emission for GTK
-}
-
 // Private implementation class for Menu
 class Menu::Impl {
  public:
@@ -255,25 +248,14 @@ class Menu::Impl {
   bool visible_;
 };
 
-// Menu static factory method
-std::shared_ptr<Menu> Menu::Create() {
-  GtkWidget* gtk_menu = gtk_menu_new();
-  auto menu = std::shared_ptr<Menu>(new Menu());
-  menu->pimpl_ = std::unique_ptr<Impl>(new Impl(gtk_menu));
-  menu->id = g_next_menu_id++;
-
-  // Register the Menu for event emission
-  g_menu_registry[menu->id] = menu.get();
-
-  return menu;
-}
-
-Menu::Menu() : id(0) {
-  // Constructor body - id will be set in Create method
+Menu::Menu()
+    : id(g_next_menu_id++),
+      pimpl_(std::unique_ptr<Impl>(new Impl(gtk_menu_new()))) {
+  g_menu_registry[id] = this;
 }
 
-Menu::Menu(void* menu) : pimpl_(new Impl((GtkWidget*)menu)) {
-  id = g_next_menu_id++;
+Menu::Menu(void* menu)
+    : id(g_next_menu_id++), pimpl_(new Impl((GtkWidget*)menu)) {
   g_menu_registry[id] = this;
 }
 
@@ -346,12 +328,12 @@ void Menu::Clear() {
 }
 
 void Menu::AddSeparator() {
-  auto separator = MenuItem::CreateSeparator();
+  auto separator = std::make_shared<MenuItem>("", MenuItemType::Separator);
   AddItem(separator);
 }
 
 void Menu::InsertSeparator(size_t index) {
-  auto separator = MenuItem::CreateSeparator();
+  auto separator = std::make_shared<MenuItem>("", MenuItemType::Separator);
   InsertItem(index, separator);
 }
 
@@ -445,15 +427,15 @@ bool Menu::IsEnabled() const {
 }
 
 std::shared_ptr<MenuItem> Menu::CreateAndAddItem(const std::string& text) {
-  auto item = MenuItem::Create(text, MenuItemType::Normal);
+  auto item = std::make_shared<MenuItem>(text, MenuItemType::Normal);
   AddItem(item);
   return item;
 }
 
 std::shared_ptr<MenuItem> Menu::CreateAndAddItem(
     const std::string& text,
     const std::optional<std::string>& icon) {
-  auto item = MenuItem::Create(text, MenuItemType::Normal);
+  auto item = std::make_shared<MenuItem>(text, MenuItemType::Normal);
   if (icon.has_value()) {
     item->SetIcon(icon);
   }
@@ -464,7 +446,7 @@ std::shared_ptr<MenuItem> Menu::CreateAndAddItem(
 std::shared_ptr<MenuItem> Menu::CreateAndAddSubmenu(
     const std::string& text,
     std::shared_ptr<Menu> submenu) {
-  auto item = MenuItem::Create(text, MenuItemType::Submenu);
+  auto item = std::make_shared<MenuItem>(text, MenuItemType::Submenu);
   item->SetSubmenu(submenu);
   AddItem(item);
   return item;

src/platform/linux/tray_icon_linux.cpp

@@ -3,6 +3,7 @@
 #include <gtk/gtk.h>
 #include <libayatana-appindicator/app-indicator.h>
 #include <iostream>
+#include <optional>
 #include <string>
 #include "../../menu.h"
 #include "../../tray_icon.h"
@@ -15,16 +16,16 @@ class TrayIcon::Impl {
  public:
   Impl(AppIndicator* indicator)
       : app_indicator_(indicator),
-        title_(""),
-        tooltip_(""),
+        title_(std::nullopt),
+        tooltip_(std::nullopt),
         context_menu_(nullptr),
         visible_(false) {}
 
   AppIndicator* app_indicator_;
   std::shared_ptr<Menu>
       context_menu_;  // Store menu shared_ptr to keep it alive
-  std::string title_;
-  std::string tooltip_;
+  std::optional<std::string> title_;
+  std::optional<std::string> tooltip_;
   bool visible_;
 };
 
@@ -119,27 +120,28 @@ void TrayIcon::SetIcon(std::string icon) {
   }
 }
 
-void TrayIcon::SetTitle(std::string title) {
+void TrayIcon::SetTitle(std::optional<std::string> title) {
   pimpl_->title_ = title;
   // AppIndicator uses the title as the accessible name and in some desktop
   // environments
   if (pimpl_->app_indicator_) {
-    app_indicator_set_title(pimpl_->app_indicator_, title.c_str());
+    const char* title_str = title.has_value() ? title->c_str() : "";
+    app_indicator_set_title(pimpl_->app_indicator_, title_str);
   }
 }
 
-std::string TrayIcon::GetTitle() {
+std::optional<std::string> TrayIcon::GetTitle() {
   return pimpl_->title_;
 }
 
-void TrayIcon::SetTooltip(std::string tooltip) {
+void TrayIcon::SetTooltip(std::optional<std::string> tooltip) {
   pimpl_->tooltip_ = tooltip;
   // AppIndicator doesn't have direct tooltip support like GtkStatusIcon
   // The tooltip functionality is typically handled through the title
   // or through custom menu items. We'll store it for potential future use.
 }
 
-std::string TrayIcon::GetTooltip() {
+std::optional<std::string> TrayIcon::GetTooltip() {
   return pimpl_->tooltip_;
 }
 
@@ -229,4 +231,8 @@ bool TrayIcon::CloseContextMenu() {
   return true;
 }
 
+void* TrayIcon::GetNativeObjectInternal() const {
+  return static_cast<void*>(pimpl_->app_indicator_);
+}
+
 }  // namespace nativeapi