X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_HistoryMenu.cpp;h=ddf7673fbf2ac0ba4d48fb1afecbc4628ba88958;hb=06e7f5859095193fc7f498bd89a7d28009794f53;hp=bfdae5390686816d58f6cd6fb00056083e99dccb;hpb=45fa5730565366d6450a2cac86965eafc5b4e0be;p=modules%2Fshaper.git diff --git a/src/XGUI/XGUI_HistoryMenu.cpp b/src/XGUI/XGUI_HistoryMenu.cpp index bfdae5390..ddf7673fb 100644 --- a/src/XGUI/XGUI_HistoryMenu.cpp +++ b/src/XGUI/XGUI_HistoryMenu.cpp @@ -1,9 +1,21 @@ -/* - * XGUI_HistoryMenu.cpp - * - * Created on: Feb 2, 2015 - * Author: sbh - */ +// Copyright (C) 2014-2023 CEA, EDF +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include @@ -56,7 +68,10 @@ void XGUI_HistoryMenu::setHistory(const QList& theActions) { myHistoryList->clear(); foreach(ActionInfo anAct, theActions) { - QListWidgetItem* anItem = new QListWidgetItem(anAct.icon, anAct.text, myHistoryList); +#ifdef _DEBUG + QListWidgetItem* anItem = +#endif + new QListWidgetItem(anAct.icon, anAct.text, myHistoryList); } } @@ -82,9 +97,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( 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 ); }