Refactor tray icon example and improve Linux menu events

Refactored the tray icon example to use the Application event loop and removed platform-specific code for macOS. Updated Linux menu event handling to use GTK 'map' and 'unmap' signals instead of 'show' and 'hide', ensuring menu open/close events are emitted only when menus are actually visible. Improved context menu handling for tray icons on Linux.

Author: lijy91

examples/tray_icon_example/main.cpp

@@ -3,16 +3,14 @@
 #include <memory>
 #include <thread>
 
+#include "../../src/application.h"
+#include "../../src/application_event.h"
 #include "../../src/image.h"
 #include "../../src/menu.h"
 #include "../../src/tray_icon.h"
 #include "../../src/tray_icon_event.h"
 #include "../../src/tray_manager.h"
 
-#ifdef __APPLE__
-#import <Cocoa/Cocoa.h>
-#endif
-
 using namespace nativeapi;
 using nativeapi::Menu;
 using nativeapi::MenuItem;
@@ -22,11 +20,8 @@ using nativeapi::MenuItemType;
 int main() {
   std::cout << "Starting TrayIcon Example..." << std::endl;
 
-#ifdef __APPLE__
-  // Initialize Cocoa application for macOS
-  [NSApplication sharedApplication];
-  [NSApp setActivationPolicy:NSApplicationActivationPolicyAccessory];
-#endif
+  // Get the Application instance - this handles platform initialization
+  Application& app = Application::GetInstance();
 
   // Check if tray icons are supported
   TrayManager& trayManager = TrayManager::GetInstance();
@@ -53,11 +48,11 @@ int main() {
     std::cout << "Tray icon ID: " << event.GetTrayIconId() << std::endl;
   });
 
-  trayIcon->AddListener<TrayIconRightClickedEvent>([](const TrayIconRightClickedEvent& event) {
+  trayIcon->AddListener<TrayIconRightClickedEvent>([trayIcon](const TrayIconRightClickedEvent& event) {
     std::cout << "*** TRAY ICON RIGHT CLICKED! ***" << std::endl;
     std::cout << "This is the right click handler working!" << std::endl;
     std::cout << "Tray icon ID: " << event.GetTrayIconId() << std::endl;
-    // Context menu will be shown automatically
+    trayIcon->OpenContextMenu();
   });
 
   trayIcon->AddListener<TrayIconDoubleClickedEvent>([](const TrayIconDoubleClickedEvent& event) {
@@ -100,10 +95,9 @@ int main() {
 
   // Add exit item
   auto exit_item = std::make_shared<MenuItem>("Exit", MenuItemType::Normal);
-  bool* should_exit = new bool(false);
-  exit_item->AddListener<MenuItemClickedEvent>([should_exit](const MenuItemClickedEvent& event) {
+  exit_item->AddListener<MenuItemClickedEvent>([&app](const MenuItemClickedEvent& event) {
     std::cout << "Exit clicked from context menu" << std::endl;
-    *should_exit = true;
+    app.Quit(0);
   });
   context_menu->AddItem(exit_item);
 
@@ -130,36 +124,21 @@ int main() {
   std::cout << "- Right click: Opens context menu" << std::endl;
   std::cout << "- Double click: Quick double click" << std::endl;
   std::cout << "- Context menu: Right-click to see options including Exit" << std::endl;
-  std::cout << "The application will run for 60 seconds, or until you click Exit." << std::endl;
+  std::cout << "Use the Exit menu item to quit the application." << std::endl;
   std::cout << "========================================" << std::endl;
 
-  // Keep the application running for 60 seconds or until exit is clicked
-  int countdown = 60;
-  while (countdown > 0 && !*should_exit) {
-    std::this_thread::sleep_for(std::chrono::seconds(1));
-    countdown--;
-
-    // Check if tray icon is still visible
-    if (!trayIcon->IsVisible()) {
-      std::cout << "Tray icon is no longer visible!" << std::endl;
-      break;
-    }
-
-    // Print countdown every 10 seconds
-    if (countdown % 10 == 0) {
-      std::cout << "Application will exit in " << countdown << " seconds..." << std::endl;
+  // Set up application event listeners
+  app.AddListener<ApplicationExitingEvent>([&trayIcon](const ApplicationExitingEvent& event) {
+    std::cout << "Application is exiting with code: " << event.GetExitCode() << std::endl;
+    // Hide the tray icon before exiting
+    if (trayIcon) {
+      trayIcon->SetVisible(false);
     }
-  }
+  });
 
-  if (*should_exit) {
-    std::cout << "Exit requested from context menu." << std::endl;
-  }
+  // Run the application event loop - this will block until app.Quit() is called
+  int exit_code = app.Run();
 
-  // Hide the tray icon before exiting
-  trayIcon->SetVisible(false);
   std::cout << "Exiting TrayIcon Example..." << std::endl;
-
-  // Cleanup
-  delete should_exit;
-  return 0;
+  return exit_code;
 }

src/platform/linux/menu_linux.cpp

@@ -43,23 +43,23 @@ static void OnGtkCheckMenuItemToggled(GtkCheckMenuItem* item, gpointer user_data
   }
 }
 
-static void OnGtkMenuShow(GtkWidget* /*menu*/, gpointer user_data) {
+static void OnGtkMenuMap(GtkWidget* /*menu*/, gpointer user_data) {
   Menu* menu_obj = static_cast<Menu*>(user_data);
   if (!menu_obj) {
     return;
   }
   menu_obj->Emit(MenuOpenedEvent(menu_obj->GetId()));
 }
 
-static void OnGtkMenuHide(GtkWidget* /*menu*/, gpointer user_data) {
+static void OnGtkMenuUnmap(GtkWidget* /*menu*/, gpointer user_data) {
   Menu* menu_obj = static_cast<Menu*>(user_data);
   if (!menu_obj) {
     return;
   }
   menu_obj->Emit(MenuClosedEvent(menu_obj->GetId()));
 }
 
-static void OnGtkSubmenuShow(GtkWidget* /*submenu*/, gpointer user_data) {
+static void OnGtkSubmenuMap(GtkWidget* /*submenu*/, gpointer user_data) {
   MenuItem* menu_item = static_cast<MenuItem*>(user_data);
   if (!menu_item) {
     return;
@@ -68,7 +68,7 @@ static void OnGtkSubmenuShow(GtkWidget* /*submenu*/, gpointer user_data) {
   menu_item->Emit(MenuItemSubmenuOpenedEvent(menu_item->GetId()));
 }
 
-static void OnGtkSubmenuHide(GtkWidget* /*submenu*/, gpointer user_data) {
+static void OnGtkSubmenuUnmap(GtkWidget* /*submenu*/, gpointer user_data) {
   MenuItem* menu_item = static_cast<MenuItem*>(user_data);
   if (!menu_item) {
     return;
@@ -404,11 +404,11 @@ void MenuItem::SetSubmenu(std::shared_ptr<Menu> submenu) {
                               (GtkWidget*)submenu->GetNativeObject());
 
     // Emit submenu open/close events on the parent item when submenu
-    // shows/hides
+    // maps/unmaps (actual visibility on screen)
     GtkWidget* submenu_widget = (GtkWidget*)submenu->GetNativeObject();
     if (submenu_widget) {
-      g_signal_connect(G_OBJECT(submenu_widget), "show", G_CALLBACK(OnGtkSubmenuShow), this);
-      g_signal_connect(G_OBJECT(submenu_widget), "hide", G_CALLBACK(OnGtkSubmenuHide), this);
+      g_signal_connect(G_OBJECT(submenu_widget), "map", G_CALLBACK(OnGtkSubmenuMap), this);
+      g_signal_connect(G_OBJECT(submenu_widget), "unmap", G_CALLBACK(OnGtkSubmenuUnmap), this);
     }
   }
 }
@@ -434,19 +434,19 @@ class Menu::Impl {
 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
+  // Connect menu map/unmap to emit open/close events when actually visible
   if (pimpl_->gtk_menu_) {
-    g_signal_connect(G_OBJECT(pimpl_->gtk_menu_), "show", G_CALLBACK(OnGtkMenuShow), this);
-    g_signal_connect(G_OBJECT(pimpl_->gtk_menu_), "hide", G_CALLBACK(OnGtkMenuHide), this);
+    g_signal_connect(G_OBJECT(pimpl_->gtk_menu_), "map", G_CALLBACK(OnGtkMenuMap), this);
+    g_signal_connect(G_OBJECT(pimpl_->gtk_menu_), "unmap", G_CALLBACK(OnGtkMenuUnmap), this);
   }
 }
 
 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);
-    g_signal_connect(G_OBJECT(pimpl_->gtk_menu_), "hide", G_CALLBACK(OnGtkMenuHide), this);
+    g_signal_connect(G_OBJECT(pimpl_->gtk_menu_), "map", G_CALLBACK(OnGtkMenuMap), this);
+    g_signal_connect(G_OBJECT(pimpl_->gtk_menu_), "unmap", G_CALLBACK(OnGtkMenuUnmap), this);
   }
 }
 

src/platform/linux/tray_icon_linux.cpp

@@ -183,6 +183,9 @@ void TrayIcon::SetContextMenu(std::shared_ptr<Menu> menu) {
   if (pimpl_->app_indicator_ && menu && menu->GetNativeObject()) {
     GtkMenu* gtk_menu = static_cast<GtkMenu*>(menu->GetNativeObject());
     app_indicator_set_menu(pimpl_->app_indicator_, gtk_menu);
+    // Ensure the menu and its children are realized; actual popup is controlled
+    // by the indicator. Using map/unmap signals in menu_linux.cpp prevents
+    // premature opened/closed emissions.
     gtk_widget_show_all(GTK_WIDGET(gtk_menu));
   }
 }