-// Copyright (C) 2014-2019 CEA/DEN, EDF R&D
+// 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
//********************************************************************
XGUI_ActiveControlSelector* XGUI_ActiveControlMgr::getSelector(const QString& theType)
{
- XGUI_ActiveControlSelector* aSelector;
+ XGUI_ActiveControlSelector* aSelector = 0;
for (int i = 0, aCount = mySelectors.count(); i < aCount; i++)
{
if (mySelectors[i]->getType() != theType)
void XGUI_ActiveControlMgr::onSelectorDeactivated()
{
XGUI_ActiveControlSelector* aSelector = qobject_cast<XGUI_ActiveControlSelector*>(sender());
- if (!aSelector || aSelector != myActiveSelector || !myActiveSelector)
+ deactivateSelector(aSelector);
+}
+
+//********************************************************************
+void XGUI_ActiveControlMgr::deactivateSelector(XGUI_ActiveControlSelector* theSelector)
+{
+ if (!theSelector || theSelector != myActiveSelector || !myActiveSelector)
return;
if (myIsBlocked) // we've come here from the same method
activateSelector(NULL);
XGUI_ActiveControlSelector* aSelectorToBeActivated = 0;
- for (int i = 0, aCount = mySelectors.count(); i < aCount; i++)
- {
- if (!mySelectors[i]->needToBeActiated())
+ for (int i = 0, aCount = mySelectors.count(); i < aCount; i++) {
+ if (!mySelectors[i]->needToBeActivated())
continue;
aSelectorToBeActivated = mySelectors[i];
break;