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

Fix bug in availableToGrowOnSide() and add unit-test

Browse Source
This commit is contained in:
Sergio Martins
2020-06-10 20:30:31 +01:00
parent 47795d0751
commit bb79bd12a7
2 changed files with 42 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2638,7 +2638,7 @@ int ItemContainer::availableToGrowOnSide(const Item *child, Side side) const
const int max = neighboursMaxLengthFor(child, side, d->m_orientation);
// It's fine if length is bigger than max. As max is just an hint, which we try to honour but some times it's not possible.
return qMin(0, max - length);
return qMax(0, max - length);
}
int ItemContainer::availableToSqueezeOnSide_recursive(const Item *child, Side side, Qt::Orientation orientation) const

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

@@ -187,6 +187,7 @@ private Q_SLOTS:
void tst_containerReducesSize();
void tst_insertHiddenContainer();
void tst_availableOnSide();
void tst_availableToGrowOnSide();
void tst_resizeViaSeparator();
void tst_resizeViaSeparator2();
void tst_resizeViaSeparator3();
@@ -1262,6 +1263,8 @@ void TestMultiSplitter::tst_insertHiddenContainer()
void TestMultiSplitter::tst_availableOnSide()
{
// Tests that items are available to squeeze a certain amount (without violating their min-size)
auto root = createRoot();
Item *item1 = createItem(/*min=*/QSize(100, 100));
root->setSize(QSize(1000, 1000));
@@ -1310,6 +1313,44 @@ void TestMultiSplitter::tst_availableOnSide()
QCOMPARE(container31->maxPosForSeparator_global(separator31), root->width() -item31->minSize().width() - Item::separatorThickness);
}
void TestMultiSplitter::tst_availableToGrowOnSide()
{
// Tests that items are available to grow a certain amount (without violating their max-size)
auto root = createRoot();
Item *item1 = createItem(/*min=*/QSize(100, 100), /*max=*/QSize(230, 230));
root->setSize(QSize(1000, 1000));
root->insertItem(item1, Item::Location_OnLeft);
QCOMPARE(root->availableToGrowOnSide(item1, Side1), 0);
QCOMPARE(root->availableToGrowOnSide(item1, Side2), 0);
Item *item2 = createItem(/*min=*/QSize(200, 200));
root->insertItem(item2, Item::Location_OnRight);
// give a resize, so item1 gets smaller than its max-size. Will be unneeded soon
root->setSize_recursive(QSize(1001, 1001));
QCOMPARE(root->availableToGrowOnSide(item1, Side1), 0);
QCOMPARE(root->availableToGrowOnSide(item2, Side2), 0);
QCOMPARE(root->availableToGrowOnSide(item1, Side2), root->length() - item2->width());
QCOMPARE(root->availableToGrowOnSide(item2, Side1), item1->maxSizeHint().width() - item1->width());
auto separator = root->separators_recursive()[0];
QCOMPARE(root->minPosForSeparator_global(separator, true), item1->minSize().width());
QCOMPARE(root->maxPosForSeparator_global(separator, true), item1->maxSizeHint().width());
Item *item3 = createItem(/*min=*/QSize(200, 200), /*max=*/QSize(200, 200));
root->insertItem(item3, Item::Location_OnRight);
QVERIFY(root->checkSanity());
QCOMPARE(root->availableToGrowOnSide(item3, Side2), 0);
QCOMPARE(root->availableToGrowOnSide(item3, Side1), root->length() - item2->width() - item1->width());
QCOMPARE(root->availableToGrowOnSide(item2, Side1), item1->maxSizeHint().width() - item1->width());
QCOMPARE(root->availableToGrowOnSide(item2, Side2), item3->maxSizeHint().width() - item3->width());
}
void TestMultiSplitter::tst_resizeViaSeparator()
{
auto root = createRoot();