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

Changed store and restore functioality to save the current dock widget name of an dock area instead of the current index because if some dock widgets are missing when loading the configuration, the dock index might be wrong

Browse Source
This commit is contained in:
Uwe Kindler
2018-11-01 08:52:14 +01:00
parent 5e6c82b68d
commit 3f5697554a
4 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/DockAreaWidget.cpp
View File

@@ -451,13 +451,20 @@ CDockWidget* CDockAreaWidget::currentDockWidget() const
//============================================================================
void CDockAreaWidget::setCurrentDockWidget(CDockWidget* DockWidget)
{
int Index = index(DockWidget);
if (Index < 0)
if (dockManager()->isRestoringState())
{
return;
}
if (dockManager()->isRestoringState())
internalSetCurrentDockWidget(DockWidget);
}
//============================================================================
void CDockAreaWidget::internalSetCurrentDockWidget(CDockWidget* DockWidget)
{
int Index = index(DockWidget);
if (Index < 0)
{
return;
}
@@ -607,9 +614,9 @@ void CDockAreaWidget::saveState(QXmlStreamWriter& s) const
{
s.writeStartElement("DockAreaWidget");
s.writeAttribute("Tabs", QString::number(d->ContentsLayout->count()));
s.writeAttribute("CurrentIndex", QString::number(d->ContentsLayout->currentIndex()));
s.writeAttribute("CurrentDockWidget", currentDockWidget()->objectName());
qDebug() << "CDockAreaWidget::saveState TabCount: " << d->ContentsLayout->count()
<< " CurrentIndex: " << d->ContentsLayout->currentIndex();
<< " CurrentDockWidge: " << currentDockWidget()->objectName();
for (int i = 0; i < d->ContentsLayout->count(); ++i)
{
dockWidget(i)->saveState(s);