Sidebar overlays now maintain their size when toggled

Fixes #155
KDAB · Feb 6, 2021 · 4c33cd6 · 4c33cd6
1 parent ea48d52
commit 4c33cd6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/Changelog b/Changelog
@@ -15,6 +15,7 @@
     had manually reordered tabs (#154)
   - Fixed crash when hosting a QQuickWidget (#150)
   - Fixed CMake Visual Studio generator not working
+  - Sidebar overlays now maintain their size when toggled (#155)
 
 * v1.2.1 (6 February 2021)
   - Support for resizing dock widgets when they are in overlay/popup mode (autohide/sidebar feature)

diff --git a/src/MainWindowBase.cpp b/src/MainWindowBase.cpp
@@ -52,7 +52,7 @@ class MainWindowBase::Private
 
     QRect rectForOverlay(Frame *, SideBarLocation) const;
     SideBarLocation preferredSideBar(DockWidgetBase *) const;
-    void updateOverlayGeometry(QSize suggestedSize = {});
+    void updateOverlayGeometry(QSize suggestedSize);
     void clearSideBars();
 
     QString name;
@@ -367,7 +367,7 @@ void MainWindowBase::Private::updateOverlayGeometry(QSize suggestedSize)
 
     Frame *frame = m_overlayedDockWidget->d->frame();
 
-    if (suggestedSize.isValid()) {
+    if (suggestedSize.isValid() && !suggestedSize.isEmpty()) {
         // Let's try to honour the suggested overlay size
         switch (sb->location()) {
         case SideBarLocation::North: {
@@ -468,7 +468,7 @@ void MainWindowBase::overlayOnSideBar(DockWidgetBase *dw)
     auto frame = Config::self().frameworkWidgetFactory()->createFrame(this, FrameOption_IsOverlayed);
     d->m_overlayedDockWidget = dw;
     frame->addWidget(dw);
-    d->updateOverlayGeometry();
+    d->updateOverlayGeometry(dw->d->lastPositions().lastOverlayedGeometry(sb->location()).size());
 
     auto resizeHandler = new WidgetResizeHandler(true, frame);
     resizeHandler->setAllowedResizeSides(d->allowedResizeSides(sb->location()));

diff --git a/tests/tst_docks.cpp b/tests/tst_docks.cpp
@@ -5334,6 +5334,7 @@ void TestDocks::tst_overlayedGeometryIsSaved()
     Frame *frame = dw1->dptr()->frame();
     QVERIFY(frame->isOverlayed());
     QCOMPARE(dw1->sideBarLocation(), SideBarLocation::North);
+    QVERIFY(frame->height() > 0);
 
     const int newHeight = frame->height() + 300;
     frame->setHeight(newHeight);
@@ -5342,7 +5343,6 @@ void TestDocks::tst_overlayedGeometryIsSaved()
     m1->toggleOverlayOnSideBar(dw1);
 
     frame = dw1->dptr()->frame();
-    QEXPECT_FAIL("", "Will fix", Continue);
     QCOMPARE(frame->height(), newHeight);
 }