-// Copyright (C) 2014-2017 CEA/DEN, EDF R&D
+// Copyright (C) 2014-2024 CEA, EDF
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
// 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
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// See http://www.salome-platform.org/ or
-// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include <XGUI_PropertyPanelSelector.h>
//********************************************************************
void XGUI_PropertyPanelSelector::setActive(const bool& isActive)
{
- if (isActive) {
- if (myWidgetToBeActivated)
- myPanel->activateWidget(myWidgetToBeActivated, true);
+ if (isActive && myWidgetToBeActivated) {
+ // e.g. widget sketch label
+ myPanel->activateWidget(myWidgetToBeActivated, true);
+ myWidgetToBeActivated = NULL;
return;
}
- ModuleBase_ModelWidget* aWidget = myPanel->activeWidget();
- if (aWidget && aWidget->needToBeActiated())
- {
- myWidgetToBeActivated = aWidget;
+
+ if (!isActive) { // on deactivating, store previous active widget
+ ModuleBase_ModelWidget* aWidget = myPanel->activeWidget();
+ if (aWidget && aWidget->needToBeActivated())
+ {
+ myWidgetToBeActivated = aWidget;
+ }
+ myPanel->activateWidget(NULL, false);
}
- myPanel->activateWidget(NULL, false);
}
//********************************************************************
-bool XGUI_PropertyPanelSelector::needToBeActiated() const
+bool XGUI_PropertyPanelSelector::needToBeActivated() const
{
return myWidgetToBeActivated != NULL;
}