Scarfski/Qt-Advanced-Docking-System
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed the return value of dockContainer() function if no dock area is assigned, fixed flagAsUnassigned() function

Browse Source
This commit is contained in:
Uwe Kindler
2018-10-11 14:15:27 +02:00
parent 9fec2bd515
commit 548dfb363a
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/DockWidget.cpp
View File

@@ -327,7 +327,14 @@ void CDockWidget::setDockManager(CDockManager* DockManager)
//============================================================================
CDockContainerWidget* CDockWidget::dockContainer() const
{
return d->DockArea->dockContainer();
if (d->DockArea)
{
return d->DockArea->dockContainer();
}
else
{
return 0;
}
}
@@ -426,9 +433,9 @@ void CDockWidget::toggleView(bool Open)
void CDockWidget::toggleViewInternal(bool Open)
{
CDockContainerWidget* DockContainer = dockContainer();
CDockWidget* TopLevelDockWidget = nullptr;;
CDockWidget* TopLevelDockWidget = nullptr;
if (Open)
if (Open && DockContainer)
{
TopLevelDockWidget = DockContainer->topLevelDockWidget();
}
@@ -450,7 +457,7 @@ void CDockWidget::toggleViewInternal(bool Open)
d->DockArea->toggleDockWidgetView(this, Open);
}
if (!Open)
if (!Open && DockContainer)
{
TopLevelDockWidget = DockContainer->topLevelDockWidget();
}
@@ -491,6 +498,7 @@ void CDockWidget::flagAsUnassigned()
{
d->Closed = true;
setParent(d->DockManager);
setVisible(false);
setDockArea(nullptr);
tabWidget()->setParent(this);
}