Merge branch 'python_parametric_api' of https://git.salome-platform.org/git/modules...

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

diff --git a/src/XGUI/XGUI_HistoryMenu.cpp b/src/XGUI/XGUI_HistoryMenu.cpp
index 7ae27d0b3c2946413a3a9e37902b4853f6666e5a..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)
@@ -66,14 +60,16 @@ void XGUI_HistoryMenu::setHistory(const QList<ActionInfo>& theActions)
   }
 }
 
+void XGUI_HistoryMenu::leaveEvent(QEvent* theEvent)
+{
+  setStackSelectedTo(NULL);
+  QMenu::leaveEvent(theEvent);
+}
 
 void XGUI_HistoryMenu::setStackSelectedTo(QListWidgetItem * theItem)
 {
-  if (!theItem)
-    return;
-
   QListWidgetItem* eachItem = NULL;
-  bool isSelect = true;
+  bool isSelect = theItem != NULL;
   for(int aRow = 0; aRow < myHistoryList->count(); ++aRow) {
     eachItem = myHistoryList->item(aRow);
     myHistoryList->setItemSelected(eachItem, isSelect);
@@ -82,12 +78,27 @@ void XGUI_HistoryMenu::setStackSelectedTo(QListWidgetItem * theItem)
       isSelect = false;
     }
   }
+  // to avoid blinking caused by QMenu paint event (paints on top of the list)
+  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();
-  myHistoryList->clear();
+  hideUpToMenuBar( this );
 }