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

Also simplify layouts that only have 1 child

Browse Source 
Those have any orientation, so can be simplified, as its "orientation"
matches its parent one
This commit is contained in:
Sergio Martins
2020-07-06 21:15:23 +01:00
parent 090392a02e
commit 259a78ebaf
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/private/multisplitter/Item.cpp
View File

@@ -3136,7 +3136,7 @@ void ItemContainer::simplify()
if (ItemContainer *childContainer = child->asContainer()) {
childContainer->simplify(); // recurse down the hierarchy
if (childContainer->orientation() == d->m_orientation) {
if (childContainer->orientation() == d->m_orientation || childContainer->d->m_children.size() == 1) {
// This sub-container is reduntant, as it has the same orientation as its parent
// Canibalize it.
for (Item *child2 : childContainer->childItems()) {

3
src/private/multisplitter/tests/tst_multisplitter.cpp
View File

@@ -1066,6 +1066,7 @@ void TestMultiSplitter::tst_misc2()
Item *item3 = root3->childItems().constFirst();
ItemContainer *root4 = createRootWithSingleItem();
ItemContainer *root5 = createRootWithSingleItem();
Item *item5 = root5->childItems().constFirst();
root->insertItem(root1, Item::Location_OnTop);
QVERIFY(root->checkSanity());
@@ -1079,7 +1080,7 @@ void TestMultiSplitter::tst_misc2()
root->insertItem(root5, Item::Location_OnLeft);
QVERIFY(root->checkSanity());
root5->parentContainer()->removeItem(root5);
item5->parentContainer()->removeItem(item5);
QVERIFY(root->checkSanity());
QVERIFY(serializeDeserializeTest(root));
}