diff --git a/src/private/multisplitter/Widget_quick.cpp b/src/private/multisplitter/Widget_quick.cpp index 0b58f6db..7f79c854 100644 --- a/src/private/multisplitter/Widget_quick.cpp +++ b/src/private/multisplitter/Widget_quick.cpp @@ -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_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() diff --git a/src/private/quick/FloatingWindowQuick.cpp b/src/private/quick/FloatingWindowQuick.cpp index d508d7ca..814cc413 100644 --- a/src/private/quick/FloatingWindowQuick.cpp +++ b/src/private/quick/FloatingWindowQuick.cpp @@ -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); diff --git a/tests/tst_common.cpp b/tests/tst_common.cpp index f38415b8..8df64726 100644 --- a/tests/tst_common.cpp +++ b/tests/tst_common.cpp @@ -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())