X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_HistoryMenu.cpp;h=5f1ee6fa863020654cda263e5b691ff563ba7de6;hb=73b63afd03a150740406d8c5cebf45ac5125f2e3;hp=3e36f42a0c76c6aa9af8c0d987eb962dd31bceac;hpb=37bc296c8550959d2da0f6009fe1126b15009e66;p=modules%2Fshaper.git

diff --git a/src/XGUI/XGUI_HistoryMenu.cpp b/src/XGUI/XGUI_HistoryMenu.cpp
index 3e36f42a0..5f1ee6fa8 100644
--- a/src/XGUI/XGUI_HistoryMenu.cpp
+++ b/src/XGUI/XGUI_HistoryMenu.cpp
@@ -12,52 +12,64 @@
 #include <QListWidget>
 #include <QWidgetAction>
 #include <QToolButton>
+#include <QAction>
+
+XGUI_HistoryMenu::XGUI_HistoryMenu(QAction* theParent)
+ : QMenu(NULL),
+   myHistoryList(NULL)
+{
+  theParent->setMenu(this);
+  initMenu();
+
+  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(new QListWidget(this))
+   myHistoryList(NULL)
 {
   theParent->setMenu(this);
   theParent->setPopupMode(QToolButton::MenuButtonPopup);
 
+  initMenu();
+}
+
+void XGUI_HistoryMenu::initMenu()
+{
+  myHistoryList = new QListWidget(this);
   QWidgetAction* aListAction = new QWidgetAction(this);
   aListAction->setDefaultWidget(myHistoryList);
   this->addAction(aListAction);
-
-  myHistoryList->setMouseTracking(true); // track mouse hover
+  myHistoryList->setMouseTracking(true);  // track mouse hover
   myHistoryList->setSelectionMode(QAbstractItemView::ExtendedSelection);
-  connect(myHistoryList, SIGNAL(itemEntered(QListWidgetItem *)),
-          this,          SLOT(setStackSelectedTo(QListWidgetItem *)));
-  connect(myHistoryList, SIGNAL(itemClicked(QListWidgetItem *)),
-          this,          SLOT(onItemPressed(QListWidgetItem *)));
+  connect(myHistoryList, SIGNAL(itemEntered(QListWidgetItem *)), this,
+          SLOT(setStackSelectedTo(QListWidgetItem *)));
+  connect(myHistoryList, SIGNAL(itemClicked(QListWidgetItem *)), this,
+          SLOT(onItemPressed(QListWidgetItem *)));
 }
 
 XGUI_HistoryMenu::~XGUI_HistoryMenu()
 {
 }
 
-void XGUI_HistoryMenu::setHistory(const QList<QAction*>& theActions)
+void XGUI_HistoryMenu::setHistory(const QList<ActionInfo>& theActions)
 {
   myHistoryList->clear();
-  foreach(QAction* anAct, theActions) {
-    QListWidgetItem* anItem = new QListWidgetItem(anAct->icon(),
-                                                  anAct->text(),
-                                                  myHistoryList);
-    anAct->deleteLater();
+  foreach(ActionInfo anAct, theActions) {
+    QListWidgetItem* anItem = new QListWidgetItem(anAct.icon, anAct.text, myHistoryList);
   }
 }
 
+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);
@@ -66,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 actionsSelected(selectedSize);
-  hide();
-  myHistoryList->clear();
+  emit actionSelected(selectedSize);
+  hideUpToMenuBar( this );
 }