Remove Menu enabled state API and implementation

Eliminates the SetEnabled and IsEnabled methods from the Menu class and its C API, along with related internal state and logic on all platforms. Menu items retain their enabled state, but menus themselves are no longer globally enabled/disabled. This simplifies the menu API and implementation.

Author: lijy91

src/capi/menu_c.cpp

@@ -885,29 +885,6 @@ bool native_menu_close(native_menu_t menu) {
   }
 }
 
-void native_menu_set_enabled(native_menu_t menu, bool enabled) {
-  if (!menu)
-    return;
-
-  try {
-    auto menu_ptr = static_cast<Menu*>(menu);
-    menu_ptr->SetEnabled(enabled);
-  } catch (...) {
-    // Ignore exceptions
-  }
-}
-
-bool native_menu_is_enabled(native_menu_t menu) {
-  if (!menu)
-    return false;
-
-  try {
-    auto menu_ptr = static_cast<Menu*>(menu);
-    return menu_ptr->IsEnabled();
-  } catch (...) {
-    return false;
-  }
-}
 
 // New menu event listener API implementation
 int native_menu_add_listener(native_menu_t menu,

src/capi/menu_c.h

@@ -506,22 +506,6 @@ bool native_menu_open(native_menu_t menu);
 FFI_PLUGIN_EXPORT
 bool native_menu_close(native_menu_t menu);
 
-/**
- * Set the enabled state of the menu
- * @param menu The menu
- * @param enabled true to enable, false to disable
- */
-FFI_PLUGIN_EXPORT
-void native_menu_set_enabled(native_menu_t menu, bool enabled);
-
-/**
- * Check if the menu is enabled
- * @param menu The menu
- * @return true if enabled, false otherwise
- */
-FFI_PLUGIN_EXPORT
-bool native_menu_is_enabled(native_menu_t menu);
-
 /**
  * Add event listener for a menu
  * @param menu The menu

src/menu.h

@@ -686,22 +686,6 @@ class Menu : public EventEmitter<MenuEvent>, public NativeObjectProvider {
    */
   bool Close();
 
-  /**
-   * @brief Enable or disable the entire menu.
-   *
-   * When disabled, all menu items become non-interactive.
-   *
-   * @param enabled true to enable the menu, false to disable it
-   */
-  void SetEnabled(bool enabled);
-
-  /**
-   * @brief Check if the menu is currently enabled.
-   *
-   * @return true if the menu is enabled, false if disabled
-   */
-  bool IsEnabled() const;
-
  protected:
   /**
    * @brief Internal method to get the platform-specific native menu object.

src/platform/linux/menu_linux.cpp

@@ -65,7 +65,6 @@ class MenuItem::Impl {
         title_(""),
         tooltip_(""),
         type_(type),
-        enabled_(true),
         state_(MenuItemState::Unchecked),
         radio_group_(-1),
         accelerator_("", KeyboardAccelerator::None) {}
@@ -76,7 +75,6 @@ class MenuItem::Impl {
   std::shared_ptr<Image> image_;
   std::optional<std::string> tooltip_;
   MenuItemType type_;
-  bool enabled_;
   MenuItemState state_;
   int radio_group_;
   KeyboardAccelerator accelerator_;
@@ -197,14 +195,16 @@ void MenuItem::RemoveAccelerator() {
 }
 
 void MenuItem::SetEnabled(bool enabled) {
-  pimpl_->enabled_ = enabled;
   if (pimpl_->gtk_menu_item_) {
     gtk_widget_set_sensitive(pimpl_->gtk_menu_item_, enabled ? TRUE : FALSE);
   }
 }
 
 bool MenuItem::IsEnabled() const {
-  return pimpl_->enabled_;
+  if (pimpl_->gtk_menu_item_) {
+    return gtk_widget_get_sensitive(pimpl_->gtk_menu_item_) == TRUE;
+  }
+  return true;
 }
 
 void MenuItem::SetState(MenuItemState state) {
@@ -261,7 +261,7 @@ void MenuItem::RemoveSubmenu() {
 }
 
 bool MenuItem::Trigger() {
-  if (!pimpl_->enabled_)
+  if (!IsEnabled())
     return false;
   if (pimpl_->gtk_menu_item_) {
     g_signal_emit_by_name(pimpl_->gtk_menu_item_, "activate");
@@ -277,12 +277,11 @@ void* MenuItem::GetNativeObjectInternal() const {
 // Private implementation class for Menu
 class Menu::Impl {
  public:
-  Impl(MenuId id, GtkWidget* menu) : id_(id), gtk_menu_(menu), enabled_(true) {}
+  Impl(MenuId id, GtkWidget* menu) : id_(id), gtk_menu_(menu) {}
 
   MenuId id_;
   GtkWidget* gtk_menu_;
   std::vector<std::shared_ptr<MenuItem>> items_;
-  bool enabled_;
 };
 
 Menu::Menu() {
@@ -441,17 +440,6 @@ bool Menu::Close() {
   return false;
 }
 
-void Menu::SetEnabled(bool enabled) {
-  pimpl_->enabled_ = enabled;
-  if (pimpl_->gtk_menu_) {
-    gtk_widget_set_sensitive(pimpl_->gtk_menu_, enabled ? TRUE : FALSE);
-  }
-}
-
-bool Menu::IsEnabled() const {
-  return pimpl_->enabled_;
-}
-
 void* Menu::GetNativeObjectInternal() const {
   return (void*)pimpl_->gtk_menu_;
 }

src/platform/macos/menu_macos.mm

@@ -195,7 +195,6 @@ - (void)menuDidClose:(NSMenu*)menu {
   std::optional<std::string> tooltip_;
   KeyboardAccelerator accelerator_;
   bool has_accelerator_;
-  bool enabled_;
   MenuItemState state_;
   int radio_group_;
   std::shared_ptr<Menu> submenu_;
@@ -209,7 +208,6 @@ - (void)menuDidClose:(NSMenu*)menu {
         type_(type),
         accelerator_("", KeyboardAccelerator::None),
         has_accelerator_(false),
-        enabled_(true),
         state_(MenuItemState::Unchecked),
         radio_group_(-1),
         submenu_opened_listener_id_(0),
@@ -382,12 +380,11 @@ - (void)menuDidClose:(NSMenu*)menu {
 }
 
 void MenuItem::SetEnabled(bool enabled) {
-  pimpl_->enabled_ = enabled;
   [pimpl_->ns_menu_item_ setEnabled:enabled];
 }
 
 bool MenuItem::IsEnabled() const {
-  return pimpl_->enabled_;
+  return [pimpl_->ns_menu_item_ isEnabled];
 }
 
 void MenuItem::SetState(MenuItemState state) {
@@ -528,7 +525,7 @@ - (void)menuDidClose:(NSMenu*)menu {
 }
 
 bool MenuItem::Trigger() {
-  if (!pimpl_->enabled_)
+  if (!IsEnabled())
     return false;
 
   // Call the block directly instead of going through target-action
@@ -549,15 +546,11 @@ - (void)menuDidClose:(NSMenu*)menu {
   NSMenu* ns_menu_;
   NSMenuDelegateImpl* delegate_;
   std::vector<std::shared_ptr<MenuItem>> items_;
-  bool enabled_;
-  bool visible_;
 
   Impl(MenuId id, NSMenu* menu)
       : id_(id),
         ns_menu_(menu),
-        delegate_([[NSMenuDelegateImpl alloc] init]),
-        enabled_(true),
-        visible_(false) {
+        delegate_([[NSMenuDelegateImpl alloc] init]) {
     [ns_menu_ setDelegate:delegate_];
   }
 
@@ -735,14 +728,11 @@ - (void)menuDidClose:(NSMenu*)menu {
                                       clickCount:1
                                         pressure:1.0];
 
-    pimpl_->visible_ = true;
-
     @autoreleasepool {
       NSView* dummy_view = [[NSView alloc] init];
       [NSMenu popUpContextMenu:pimpl_->ns_menu_ withEvent:event forView:dummy_view];
     }
 
-    pimpl_->visible_ = false;
     return true;
   }
 
@@ -762,8 +752,6 @@ - (void)menuDidClose:(NSMenu*)menu {
 
   NSPoint point = NSMakePoint(x, final_y);
 
-  pimpl_->visible_ = true;
-
   // Use dispatch to ensure menu popup happens on the main run loop
   dispatch_async(dispatch_get_main_queue(), ^{
     [pimpl_->ns_menu_ popUpMenuPositioningItem:nil atLocation:point inView:content_view];
@@ -778,24 +766,8 @@ - (void)menuDidClose:(NSMenu*)menu {
 }
 
 bool Menu::Close() {
-  if (pimpl_->visible_) {
-    [pimpl_->ns_menu_ cancelTracking];
-    pimpl_->visible_ = false;
-    return true;
-  }
-  return false;
-}
-
-void Menu::SetEnabled(bool enabled) {
-  pimpl_->enabled_ = enabled;
-  // Enable/disable all items
-  for (auto& item : pimpl_->items_) {
-    item->SetEnabled(enabled);
-  }
-}
-
-bool Menu::IsEnabled() const {
-  return pimpl_->enabled_;
+  [pimpl_->ns_menu_ cancelTracking];
+  return true;
 }
 
 void* Menu::GetNativeObjectInternal() const {

src/platform/windows/menu_windows.cpp

@@ -97,7 +97,6 @@ class MenuItem::Impl {
   std::optional<std::string> tooltip_;
   KeyboardAccelerator accelerator_;
   bool has_accelerator_;
-  bool enabled_;
   MenuItemState state_;
   int radio_group_;
   std::shared_ptr<Menu> submenu_;
@@ -108,7 +107,6 @@ class MenuItem::Impl {
         type_(type),
         accelerator_("", KeyboardAccelerator::None),
         has_accelerator_(false),
-        enabled_(true),
         state_(MenuItemState::Unchecked),
         radio_group_(-1) {}
 
@@ -195,14 +193,19 @@ void MenuItem::RemoveAccelerator() {
 }
 
 void MenuItem::SetEnabled(bool enabled) {
-  pimpl_->enabled_ = enabled;
   if (pimpl_->parent_menu_) {
     EnableMenuItem(pimpl_->parent_menu_, pimpl_->id_, enabled ? MF_ENABLED : MF_GRAYED);
   }
 }
 
 bool MenuItem::IsEnabled() const {
-  return pimpl_->enabled_;
+  if (pimpl_->parent_menu_) {
+    UINT state = GetMenuState(pimpl_->parent_menu_, pimpl_->id_, MF_BYCOMMAND);
+    if (state != (UINT)-1) {
+      return !(state & MF_GRAYED);
+    }
+  }
+  return true;
 }
 
 void MenuItem::SetState(MenuItemState state) {
@@ -267,7 +270,7 @@ void MenuItem::RemoveSubmenu() {
 }
 
 bool MenuItem::Trigger() {
-  if (!pimpl_->enabled_)
+  if (!IsEnabled())
     return false;
 
   try {
@@ -288,12 +291,10 @@ class Menu::Impl {
   MenuId id_;
   HMENU hmenu_;
   std::vector<std::shared_ptr<MenuItem>> items_;
-  bool enabled_;
-  bool visible_;
   int window_proc_handle_id_;
 
   Impl(MenuId id, HMENU menu)
-      : id_(id), hmenu_(menu), enabled_(true), visible_(false), window_proc_handle_id_(-1) {}
+      : id_(id), hmenu_(menu), window_proc_handle_id_(-1) {}
 
   ~Impl() {
     // Unregister window procedure handler
@@ -320,8 +321,6 @@ class Menu::Impl {
 
       if (popup_menu == hmenu_) {
         // This is our menu being opened
-        visible_ = true;
-
         // Emit menu opened event
         try {
           menu->Emit<MenuOpenedEvent>(id_);
@@ -335,8 +334,6 @@ class Menu::Impl {
 
       if (popup_menu == hmenu_) {
         // This is our menu being closed
-        visible_ = false;
-
         // Emit menu closed event
         try {
           menu->Emit<MenuClosedEvent>(id_);
@@ -568,30 +565,16 @@ bool Menu::Open() {
 }
 
 bool Menu::Close() {
-  if (pimpl_->visible_) {
-    // Send WM_CANCELMODE to close any open menus
-    HWND host_window = WindowMessageDispatcher::GetInstance().GetHostWindow();
-    if (host_window) {
-      // This will close the menu and trigger WM_UNINITMENUPOPUP
-      SendMessage(host_window, WM_CANCELMODE, 0, 0);
-    }
+  // Send WM_CANCELMODE to close any open menus
+  HWND host_window = WindowMessageDispatcher::GetInstance().GetHostWindow();
+  if (host_window) {
+    // This will close the menu and trigger WM_UNINITMENUPOPUP
+    SendMessage(host_window, WM_CANCELMODE, 0, 0);
     return true;
   }
   return false;
 }
 
-void Menu::SetEnabled(bool enabled) {
-  pimpl_->enabled_ = enabled;
-  // Enable/disable all items
-  for (auto& item : pimpl_->items_) {
-    item->SetEnabled(enabled);
-  }
-}
-
-bool Menu::IsEnabled() const {
-  return pimpl_->enabled_;
-}
-
 void* Menu::GetNativeObjectInternal() const {
   return pimpl_->hmenu_;
 }