OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#4312 Move handleMdiWindowClosed call from widget destructors to MdiSubWindow closeEvent

Browse Source 
* This way the mdi window still exists at the time of removal and we can handle the removal orderly
This commit is contained in:
Gaute Lindkvist
2019-04-16 10:41:03 +02:00
parent e41f8ec149
commit e0bbda85d9
14 changed files with 59 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
ApplicationCode/UserInterface/RiuMainWindowBase.cpp
View File

@@ -163,6 +163,44 @@ bool RiuMainWindowBase::blockSlotSubWindowActivated() const
return m_blockSlotSubWindowActivated;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuMainWindowBase::removeViewerFromMdiArea(QMdiArea* mdiArea, QWidget* viewer)
{
bool wasMaximized = viewer && viewer->isMaximized();
QMdiSubWindow* subWindowBeingClosed = findMdiSubWindow(viewer);
bool removedSubWindowWasActive = false;
if (subWindowBeingClosed->isActiveWindow())
{
// If we are removing the active window, we will need a new active window
// Start by making the window inactive so Qt doesn't pick the active window itself
mdiArea->setActiveSubWindow(nullptr);
removedSubWindowWasActive = true;
}
mdiArea->removeSubWindow(subWindowBeingClosed);
QList<QMdiSubWindow*> subWindowList = mdiArea->subWindowList(QMdiArea::ActivationHistoryOrder);
if (!subWindowList.empty())
{
if (removedSubWindowWasActive)
{
mdiArea->setActiveSubWindow(nullptr);
// Make the last activated window the current activated one
mdiArea->setActiveSubWindow(subWindowList.back());
}
if (wasMaximized && mdiArea->currentSubWindow())
{
mdiArea->currentSubWindow()->showMaximized();
}
else if (subWindowsAreTiled())
{
tileSubWindows();
}
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------