Allow to show or hide menu items

libyui · Sep 30, 2020 · e4bc471 · e4bc471
1 parent 5b5d24d
commit e4bc471
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 0 deletions.
diff --git a/src/NCMenuBar.cc b/src/NCMenuBar.cc
@@ -111,6 +111,9 @@ NCMenuBar::rebuildMenuTree()
 	if ( ! item->isMenu() )
 	    YUI_THROW( YUIException( "NCMenuBar: Only menus allowed on toplevel. ") );
 
+	if ( ! item->isVisible() )
+	    continue;
+
 	Menu * menu = new Menu();
 	menu->item = item;
 	menu->position = wpos( 0, width );
@@ -189,6 +192,15 @@ NCMenuBar::setItemEnabled( YMenuItem * item, bool enabled )
 }
 
 
+void
+NCMenuBar::setItemVisible( YMenuItem * item, bool visible )
+{
+    YMenuWidget::setItemVisible( item, visible );
+    rebuildMenuTree();
+    wRedraw();
+}
+
+
 void
 NCMenuBar::activateItem( YMenuItem * item )
 {

diff --git a/src/NCMenuBar.h b/src/NCMenuBar.h
@@ -57,6 +57,13 @@ class NCMenuBar: public YMenuBar, public NCWidget
      **/
     virtual void setItemEnabled( YMenuItem * item, bool enabled );
 
+    /**
+     * show or hide an item.
+     *
+     * Reimplemented from YMenuWidget.
+     **/
+    virtual void setItemVisible( YMenuItem * item, bool visible );
+
     /**
      * Support for the Rest API for UI testing:
      *

diff --git a/src/NCPopupMenu.cc b/src/NCPopupMenu.cc
@@ -59,6 +59,9 @@ NCPopupMenu::NCPopupMenu( const wpos & at, YItemIterator begin, YItemIterator en
 	YMenuItem * menuItem = dynamic_cast<YMenuItem *>( *it );
 	YUI_CHECK_PTR( menuItem );
 
+	if ( ! menuItem->isVisible() )
+	    continue;
+
 	row[0] = menuItem->label();
 	row[1] = menuItem->hasChildren() ? "..." : "";