mirrors/Qt-Advanced-Docking-System
1
0
Fork 0
mirror of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System.git synced 2024-12-25 23:51:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes pack. Parenting, memory leaks, floating widgets deleting.

Browse Source 
* DockWidget always has DockAreaWidget as parent. It's not necessary to make it nullptr. This fixes many bugs related to restoring inactive tabbed DockWidgets.

* Fixed memory leaks related to QBoxLayout::takeAt().

* Fixed algorithm of deleting remaining floating widgets after restore.
This commit is contained in:
Yurii Miroshnyk 2020-08-21 19:20:54 +03:00
parent 703a9b3e12
commit a565239c4a
3 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/DockAreaWidget.cpp
View File

@ -86,18 +86,6 @@ public:
} }
/**
* Delete widgets without parents in this layout
*/
~CDockAreaLayout()
{
for(auto Widget : m_Widgets)
{
if(!Widget->parent())
delete Widget;
}
}
/** /**
* Returns the number of widgets in this layout * Returns the number of widgets in this layout
*/ */
@ -112,7 +100,6 @@ public:
*/ */
void insertWidget(int index, QWidget* Widget) void insertWidget(int index, QWidget* Widget)
{ {
Widget->setParent(nullptr);
if (index < 0) if (index < 0)
{ {
index = m_Widgets.count(); index = m_Widgets.count();
@ -143,6 +130,8 @@ public:
{ {
LayoutItem->widget()->setParent(nullptr); LayoutItem->widget()->setParent(nullptr);
} }
delete LayoutItem;
m_CurrentWidget = nullptr; m_CurrentWidget = nullptr;
m_CurrentIndex = -1; m_CurrentIndex = -1;
} }
@ -182,11 +171,7 @@ public:
parent->setUpdatesEnabled(false); parent->setUpdatesEnabled(false);
} }
auto LayoutItem = m_ParentLayout->takeAt(1); delete m_ParentLayout->takeAt(1);
if (LayoutItem)
{
LayoutItem->widget()->setParent(nullptr);
}
m_ParentLayout->addWidget(next); m_ParentLayout->addWidget(next);
if (prev) if (prev)
@ -247,7 +232,7 @@ public:
using DockAreaLayout = CDockAreaLayout; using DockAreaLayout = CDockAreaLayout;
static constexpr DockWidgetAreas DefaultAllowedAreas = AllDockAreas; static const DockWidgetAreas DefaultAllowedAreas = AllDockAreas;
/** /**

8
src/DockManager.cpp
View File

@ -296,11 +296,11 @@ bool DockManagerPrivate::restoreStateFromXml(const QByteArray &state, int versi
{ {
// Delete remaining empty floating widgets // Delete remaining empty floating widgets
int FloatingWidgetIndex = DockContainerCount - 1; int FloatingWidgetIndex = DockContainerCount - 1;
int DeleteCount = FloatingWidgets.count() - FloatingWidgetIndex; for (int i = FloatingWidgetIndex; i < FloatingWidgets.count(); ++i)
for (int i = 0; i < DeleteCount; ++i)
{ {
FloatingWidgets[FloatingWidgetIndex + i]->deleteLater(); auto* floatingWidget = FloatingWidgets[i];
_this->removeDockContainer(FloatingWidgets[FloatingWidgetIndex + i]->dockContainer()); _this->removeDockContainer(floatingWidget->dockContainer());
floatingWidget->deleteLater();
} }
} }

1
src/DockWidget.cpp
View File

@ -542,6 +542,7 @@ void CDockWidget::setDockArea(CDockAreaWidget* DockArea)
{ {
d->DockArea = DockArea; d->DockArea = DockArea;
d->ToggleViewAction->setChecked(DockArea != nullptr && !this->isClosed()); d->ToggleViewAction->setChecked(DockArea != nullptr && !this->isClosed());
setParent(DockArea);
} }