Issue #1037 : do not find model indices for the same result. If selection mode is...

[modules/shaper.git] / src / XGUI / XGUI_HistoryMenu.cpp

diff --git a/src/XGUI/XGUI_HistoryMenu.cpp b/src/XGUI/XGUI_HistoryMenu.cpp
index 95c6ae802bd7811ce71fcc4d221a2bb1db4ae491..5f1ee6fa863020654cda263e5b691ff563ba7de6 100644 (file)
--- a/src/XGUI/XGUI_HistoryMenu.cpp
+++ b/src/XGUI/XGUI_HistoryMenu.cpp
@@ -14,9 +14,6 @@
 #include <QToolButton>
 #include <QAction>
 
-//! Extends given feature with previously created context menu.
-//! \param theId - Id of the feature to add \a theMenu
-//! \param theMenu - Enables or disables menu feature
 XGUI_HistoryMenu::XGUI_HistoryMenu(QAction* theParent)
  : QMenu(NULL),
    myHistoryList(NULL)
@@ -27,9 +24,6 @@ XGUI_HistoryMenu::XGUI_HistoryMenu(QAction* theParent)
   connect(theParent, SIGNAL(destroyed()), this, SLOT(deleteLater()));
 }
 
-//! Extends given feature with previously created context menu.
-//! \param theId - Id of the feature to add \a theMenu
-//! \param theMenu - Enables or disables menu feature
 XGUI_HistoryMenu::XGUI_HistoryMenu(QToolButton* theParent)
  : QMenu(theParent),
    myHistoryList(NULL)
@@ -88,9 +82,23 @@ void XGUI_HistoryMenu::setStackSelectedTo(QListWidgetItem * theItem)
   myHistoryList->repaint();
 }
 
+void hideUpToMenuBar( QMenu* theMenu )
+{
+  theMenu->hide();
+  foreach( QWidget* aWidget, theMenu->menuAction()->associatedWidgets() )
+  {
+    QMenu* aMenu = qobject_cast<QMenu*>( aWidget );
+    if( aMenu )
+    {
+      aMenu->hide();
+      hideUpToMenuBar( aMenu );
+    }
+  }
+}
+
 void XGUI_HistoryMenu::onItemPressed(QListWidgetItem * theItem)
 {
   int selectedSize = myHistoryList->row(theItem) + 1;
   emit actionSelected(selectedSize);
-  hide();
+  hideUpToMenuBar( this );
 }