Merge branch '1.2'

2021-02-05 16:42:07 +00:00
parent 697417b906 621c3dbeca
commit 38443048b8
8 changed files with 67 additions and 8 deletions
--- a/src/MainWindowBase.h
+++ b/src/MainWindowBase.h
@@ -159,7 +159,7 @@ public:
    void toggleOverlayOnSideBar(DockWidgetBase *);

    /// @brief closes any overlayed dock widget. The sidebar still displays them as button.
-    void clearSideBarOverlay();
+    void clearSideBarOverlay(bool deleteFrame = true);

    /// @brief Returns the sidebar this dockwidget is in. nullptr if not in any.
    SideBar *sideBarForDockWidget(const DockWidgetBase *) const;