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

Fixed crash in DockFocusController

Browse Source 
DockWidget pointers are now wrapped into QPointer to detect deleted
DockWidgets
This commit is contained in:
Uwe Kindler 2021-11-18 22:10:11 +01:00
parent 0270993782
commit a110d53a53
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/DockFocusController.cpp
View File

@ -32,6 +32,8 @@
namespace ads namespace ads
{ {
static const char* const FocusedDockWidgetProperty = "FocusedDockWidget";
/** /**
* Private data class of CDockFocusController class (pimpl) * Private data class of CDockFocusController class (pimpl)
*/ */
@ -57,8 +59,8 @@ struct DockFocusControllerPrivate
* the dock area that it belongs to * the dock area that it belongs to
*/ */
void updateDockWidgetFocus(CDockWidget* DockWidget); void updateDockWidgetFocus(CDockWidget* DockWidget);
}; }; // struct DockFocusControllerPrivate
// struct DockFocusControllerPrivate
//=========================================================================== //===========================================================================
@ -125,7 +127,7 @@ void DockFocusControllerPrivate::updateDockWidgetFocus(CDockWidget* DockWidget)
if (Window) if (Window)
{ {
Window->setProperty("FocusedDockWidget", QVariant::fromValue<CDockWidget*>(DockWidget)); Window->setProperty(FocusedDockWidgetProperty, QVariant::fromValue(QPointer<CDockWidget>(DockWidget)));
} }
CDockAreaWidget* NewFocusedDockArea = nullptr; CDockAreaWidget* NewFocusedDockArea = nullptr;
if (FocusedDockWidget) if (FocusedDockWidget)
@ -161,7 +163,7 @@ void DockFocusControllerPrivate::updateDockWidgetFocus(CDockWidget* DockWidget)
if (NewFloatingWidget) if (NewFloatingWidget)
{ {
NewFloatingWidget->setProperty("FocusedDockWidget", QVariant::fromValue(DockWidget)); NewFloatingWidget->setProperty(FocusedDockWidgetProperty, QVariant::fromValue(QPointer<CDockWidget>(DockWidget)));
} }
@ -243,13 +245,13 @@ void CDockFocusController::onFocusWindowChanged(QWindow *focusWindow)
return; return;
} }
auto vDockWidget = focusWindow->property("FocusedDockWidget"); auto vDockWidget = focusWindow->property(FocusedDockWidgetProperty);
if (!vDockWidget.isValid()) if (!vDockWidget.isValid())
{ {
return; return;
} }
auto DockWidget = vDockWidget.value<CDockWidget*>(); auto DockWidget = vDockWidget.value<QPointer<CDockWidget>>();
if (!DockWidget) if (!DockWidget)
{ {
return; return;
@ -376,13 +378,13 @@ void CDockFocusController::notifyFloatingWidgetDrop(CFloatingDockContainer* Floa
return; return;
} }
auto vDockWidget = FloatingWidget->property("FocusedDockWidget"); auto vDockWidget = FloatingWidget->property(FocusedDockWidgetProperty);
if (!vDockWidget.isValid()) if (!vDockWidget.isValid())
{ {
return; return;
} }
auto DockWidget = vDockWidget.value<CDockWidget*>(); auto DockWidget = vDockWidget.value<QPointer<CDockWidget>>();
if (DockWidget) if (DockWidget)
{ {
DockWidget->dockAreaWidget()->setCurrentDockWidget(DockWidget); DockWidget->dockAreaWidget()->setCurrentDockWidget(DockWidget);