mirrors/Qt-Advanced-Docking-System
1
0
Fork 0
mirror of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System.git synced 2024-11-15 13:15:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed crash caused by changes related to issue #594 - deletion of CFloatingWidget caused crash when loading a state from XML

Browse Source
This commit is contained in:
Uwe Kindler 2024-01-26 16:31:04 +01:00
parent ed6636ae26
commit 644c828f00
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/DockManager.cpp
View File

@ -566,6 +566,7 @@ CDockManager::~CDockManager()
auto FloatingWidgets = d->FloatingWidgets; auto FloatingWidgets = d->FloatingWidgets;
for (auto FloatingWidget : FloatingWidgets) for (auto FloatingWidget : FloatingWidgets)
{ {
FloatingWidget->deleteContent();
delete FloatingWidget; delete FloatingWidget;
} }

18
src/FloatingDockContainer.cpp
View File

@ -760,10 +760,22 @@ CFloatingDockContainer::CFloatingDockContainer(CDockWidget *DockWidget) :
d->DockManager->notifyWidgetOrAreaRelocation(DockWidget); d->DockManager->notifyWidgetOrAreaRelocation(DockWidget);
} }
//============================================================================ //============================================================================
CFloatingDockContainer::~CFloatingDockContainer() CFloatingDockContainer::~CFloatingDockContainer()
{ {
ADS_PRINT("~CFloatingDockContainer"); ADS_PRINT("~CFloatingDockContainer");
if (d->DockManager)
{
d->DockManager->removeFloatingWidget(this);
}
delete d;
}
//============================================================================
void CFloatingDockContainer::deleteContent()
{
std::vector<QPointer<ads::CDockAreaWidget>> areas; std::vector<QPointer<ads::CDockAreaWidget>> areas;
for (int i = 0; i != dockContainer()->dockAreaCount(); ++i) for (int i = 0; i != dockContainer()->dockAreaCount(); ++i)
{ {
@ -788,12 +800,6 @@ CFloatingDockContainer::~CFloatingDockContainer()
delete ptrWdg; delete ptrWdg;
} }
} }
if (d->DockManager)
{
d->DockManager->removeFloatingWidget(this);
}
delete d;
} }
//============================================================================ //============================================================================

7
src/FloatingDockContainer.h
View File

@ -146,6 +146,13 @@ protected:
*/ */
virtual void finishDragging() override; virtual void finishDragging() override;
/**
* This function deletes all dock widgets in it.
* This functions should be called only from dock manager in its
* destructor before deleting the floating widget
*/
void deleteContent();
/** /**
* Call this function if you just want to initialize the position * Call this function if you just want to initialize the position
* and size of the floating widget * and size of the floating widget