philipp/KDDockWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge MultiSplitterLayout into MultiSplitter

Browse Source 
No need to have two. It's a leftover from the old layouting engine
This commit is contained in:
Sergio Martins
2020-06-11 14:55:31 +01:00
parent e54ef787ed
commit 86e58dd8a7
24 changed files with 784 additions and 938 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/MainWindowBase.cpp
View File

@@ -33,7 +33,6 @@
#include "Utils_p.h"
#include "Logging_p.h"
#include "DropAreaWithCentralFrame_p.h"
#include "widgets/MultiSplitterLayout_p.h"
#include "widgets/MultiSplitter_p.h"
using namespace KDDockWidgets;
@@ -113,9 +112,9 @@ MainWindowOptions MainWindowBase::options() const
return d->m_options;
}
MultiSplitterLayout *MainWindowBase::multiSplitterLayout() const
MultiSplitter *MainWindowBase::multiSplitter() const
{
return dropArea()->multiSplitterLayout();
return dropArea();
}
void MainWindowBase::setAffinities(const QStringList &affinityNames)
@@ -180,7 +179,7 @@ bool MainWindowBase::deserialize(const LayoutSaver::MainWindow &mw)
d->affinities = mw.affinities;
}
return dropArea()->multiSplitterLayout()->deserialize(mw.multiSplitterLayout);
return dropArea()->deserialize(mw.multiSplitterLayout);
}
LayoutSaver::MainWindow MainWindowBase::serialize() const
@@ -193,7 +192,7 @@ LayoutSaver::MainWindow MainWindowBase::serialize() const
m.uniqueName = uniqueName();
m.screenIndex = screenNumberForWidget(this);
m.screenSize = screenSizeForWidget(this);
m.multiSplitterLayout = dropArea()->multiSplitterLayout()->serialize();
m.multiSplitterLayout = dropArea()->serialize();
m.affinities = d->affinities;
return m;