qtquick: Fix tst_negativeAnchorPosition5

min sizes weren't bounded
This commit is contained in:
Sergio Martins
2020-10-18 21:58:46 +01:00
parent 2988e97e14
commit c0816d4924
3 changed files with 8 additions and 6 deletions

View File

@@ -22,7 +22,8 @@ Widget_quick::~Widget_quick()
QSize Widget_quick::minSize() const
{
return QSize(0, 0);
const QSize minSize = m_thisWidget->property("kddockwidgets_min_size").toSize();
return minSize.expandedTo(Item::hardcodedMinimumSize);
}
QRect Widget_quick::geometry() const
@@ -80,8 +81,9 @@ std::unique_ptr<Widget> Widget_quick::parentWidget() const
QSize Widget_quick::maxSizeHint() const
{
// Some arbitrary big value
return QSize(30000, 30000);
const QSize maxSize = m_thisWidget->property("kddockwidgets_max_size").toSize();
return maxSize.isEmpty() ? QSize(30000, 30000) // Some arbitrary big value
: maxSize;
}
void Widget_quick::show()

View File

@@ -85,7 +85,7 @@ void FloatingWindowQuick::init()
}
});
const QSize minSize(100, 100);
const QSize minSize(200, 200);
m_quickWindow->resize(minSize);
m_quickWindow->contentItem()->setSize(minSize);

View File

@@ -1044,9 +1044,9 @@ void TestCommon::tst_negativeAnchorPosition5()
auto dock1 = docks.at(1).createdDock;
dock1->show();
QVERIFY(layout->checkSanity());
dock0->show();
layout->checkSanity();
QVERIFY(layout->checkSanity());
// Cleanup
for (auto dock : DockRegistry::self()->dockwidgets())