Make the Design tab sidebar dockable and collapsible like Prepare's

The sidebar can move to either side, float, be resized, and collapse with the canvas button or Shift+Tab. Its layout is remembered separately from Prepare's, starts where Prepare's sidebar is, and View > Reset Window Layout resets both tabs.
2026-10-09 08:41:14 +00:00 · 2026-10-03 19:05:53 +08:00
parent a9c8721380
commit d47fb804c3
17 changed files with 420 additions and 164 deletions
@@ -0,0 +1,80 @@
+#include "AuiMgr.hpp"
+
+#include "GUI_App.hpp"
+#ifdef __WXGTK__
+#include "LinuxDisplayBackend.hpp"
+#endif
+
+#include <wx/aui/dockart.h>
+#include <wx/aui/floatpane.h>
+
+namespace Slic3r { namespace GUI {
+
+namespace {
+
+// TODO: listen on dark ui change
+class FloatFrame : public wxAuiFloatingFrame
+{
+public:
+    FloatFrame(wxWindow* parent, wxAuiManager* ownerMgr, const wxAuiPaneInfo& pane) : wxAuiFloatingFrame(parent, ownerMgr, pane)
+    {
+        wxGetApp().UpdateFrameDarkUI(this);
+    }
+};
+
+} // namespace
+
+void AuiMgr::init(wxWindow* window)
+{
+    SetManagedWindow(window);
+    SetDockSizeConstraint(1, 1);
+#ifdef __WXGTK__
+    // Floating and its docking hints need global pointer positions and window moves, which Wayland does not provide.
+    if (is_running_on_wayland())
+        SetFlags(GetFlags() & ~wxAUI_MGR_ALLOW_FLOATING);
+#endif
+    GetArtProvider()->SetMetric(wxAUI_DOCKART_CAPTION_SIZE, 18);
+    GetArtProvider()->SetMetric(wxAUI_DOCKART_GRADIENT_TYPE, wxAUI_GRADIENT_NONE);
+    apply_color_mode();
+}
+
+void AuiMgr::apply_color_mode()
+{
+    const bool     is_dark    = wxGetApp().dark_mode();
+    const wxColour sash_color = is_dark ? wxColour(38, 46, 48) : wxColour(206, 206, 206);
+    GetArtProvider()->SetColour(wxAUI_DOCKART_INACTIVE_CAPTION_COLOUR, sash_color);
+    GetArtProvider()->SetColour(wxAUI_DOCKART_INACTIVE_CAPTION_TEXT_COLOUR, *wxWHITE);
+    GetArtProvider()->SetColour(wxAUI_DOCKART_SASH_COLOUR, sash_color);
+    GetArtProvider()->SetColour(wxAUI_DOCKART_BORDER_COLOUR, is_dark ? *wxBLACK : wxColour(165, 165, 165));
+}
+
+void AuiMgr::track_docked_size(wxWindow* window)
+{
+    window->Bind(wxEVT_IDLE, [this, window](wxIdleEvent& evt) {
+        wxAuiPaneInfo& pane = GetPane(window);
+        if (pane.IsOk() && pane.IsShown() && pane.IsDocked() && pane.rect.GetWidth() > 0 && pane.rect.GetHeight() > 0) {
+            const bool horizontal = pane.dock_direction == wxAUI_DOCK_TOP || pane.dock_direction == wxAUI_DOCK_BOTTOM;
+            pane.BestSize(horizontal ? pane.best_size.GetWidth() : pane.rect.GetWidth(),
+                          horizontal ? pane.rect.GetHeight() : pane.best_size.GetHeight());
+        }
+        evt.Skip();
+    });
+}
+
+wxAuiPaneInfo AuiMgr::sidebar_pane_info()
+{
+    return wxAuiPaneInfo()
+        .Name("sidebar")
+        .Left()
+        .CloseButton(false)
+        .TopDockable(false)
+        .BottomDockable(false)
+        .BestSize(wxSize(39 * wxGetApp().em_unit(), 90 * wxGetApp().em_unit()));
+}
+
+wxAuiFloatingFrame* AuiMgr::CreateFloatingFrame(wxWindow* parent, const wxAuiPaneInfo& pane)
+{
+    return new FloatFrame(parent, this, pane);
+}
+
+}} // namespace Slic3r::GUI