tests++

src/private/multisplitter/Item.cpp

@@ -143,7 +143,7 @@ QWidget *Item::hostWidget() const
 
 void Item::restorePlaceholder(GuestInterface *guest)
 {
-    Q_ASSERT(isVisible() && !frame());
+    Q_ASSERT(!isVisible() && !frame());
     setFrame(guest);
     setIsVisible(true);
 }
@@ -947,6 +947,8 @@ void ItemContainer::onChildVisibleChanged(Item */*child*/, bool visible)
     } else if (!visible && numVisible == 0) {
         Q_EMIT visibleChanged(this, false);
     }
+
+    updateChildPercentages();
 }
 
 QRect ItemContainer::suggestedDropRect(QSize minSize, const Item *relativeTo, Location loc) const

tests/tst_docks.cpp

@@ -294,8 +294,8 @@ private Q_SLOTS:
     void tst_addAndReadd();
     void tst_placeholderCount();
 //    void tst_availableLengthForOrientation();
-//    void tst_setAstCurrentTab();
-//    void tst_closeShowWhenNoCentralFrame();
+    void tst_setAstCurrentTab();
+    void tst_closeShowWhenNoCentralFrame();
 //    void tst_placeholderDisappearsOnReadd();
 //    void tst_placeholdersAreRemovedPropertly();
 //    void tst_embeddedMainWindow();
@@ -3121,7 +3121,7 @@ void TestDocks::tst_availableLengthForOrientation()
     QCOMPARE(availableHeight, layout->height() - 2 *Anchor::thickness(true) - Anchor::thickness(false) -  dock1MinHeight);
     m->multiSplitterLayout()->checkSanity();
 }
-
+#endif
 void TestDocks::tst_setAstCurrentTab()
 {
     EnsureTopLevelsDeleted e;
@@ -3159,13 +3159,15 @@ void TestDocks::tst_closeShowWhenNoCentralFrame()
     QPointer<DockWidgetBase> dock1 = createDockWidget("1", new QPushButton("1"));
     m->addDockWidget(dock1, Location_OnLeft);
     dock1->close();
+    m->multiSplitterLayout()->checkSanity();
+
     QVERIFY(!dock1->frame());
     QVERIFY(!Testing::waitForDeleted(dock1)); // It was being deleted due to a bug
     QVERIFY(dock1);
     dock1->show();
     m->multiSplitterLayout()->checkSanity();
 }
-
+#if 0
 void TestDocks::tst_placeholderDisappearsOnReadd()
 {
     // This tests that addMultiSplitter also updates refcount of placeholders