Fixed bug with FloatingWidget deletion, fixed handling of unassigned DockWidgets after restoreState() call

This commit is contained in:
Uwe Kindler
2017-03-28 10:57:03 +02:00
parent 9adc524a42
commit aa8a52b845
6 changed files with 134 additions and 21 deletions

View File

@@ -34,6 +34,7 @@
#include <QList>
#include <QGridLayout>
#include <QPointer>
#include <QVariant>
#include "DockManager.h"
#include "DockAreaWidget.h"
@@ -432,6 +433,7 @@ bool DockContainerWidgetPrivate::restoreDockArea(QDataStream& stream,
<< std::endl;
DockArea->addDockWidget(DockWidget);
DockWidget->toggleView(!Closed);
DockWidget->setProperty("dirty", false);
}
if (Testing)
@@ -528,6 +530,7 @@ void DockContainerWidgetPrivate::addDockArea(CDockAreaWidget* NewDockArea, DockW
//============================================================================
void DockContainerWidgetPrivate::dumpRecursive(int level, QWidget* widget)
{
#if defined(QT_DEBUG)
QSplitter* Splitter = dynamic_cast<QSplitter*>(widget);
QByteArray buf;
buf.fill(' ', level * 4);
@@ -549,6 +552,7 @@ void DockContainerWidgetPrivate::dumpRecursive(int level, QWidget* widget)
}
std::cout << buf.toStdString() << "DockArea" << std::endl;
}
#endif
}