From 133a7f76b4d44986b66bd1b95c525269247fa364 Mon Sep 17 00:00:00 2001
From: "zhou.xu" <zhou.xu@bambulab.com>
Date: Tue, 29 Apr 2025 20:11:40 +0800
Subject: [PATCH] ENH:cancel sidebar floatable and ctrl + w

jira: STUDIO-11623
Change-Id: I699c0277797ffc5dda4d540191518eb729e52664
---
 src/slic3r/GUI/GLCanvas3D.cpp | 10 ----------
 src/slic3r/GUI/MainFrame.cpp  |  5 -----
 src/slic3r/GUI/Plater.cpp     |  4 ++--
 3 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp
index 1101ca934..61e81c4a7 100644
--- a/src/slic3r/GUI/GLCanvas3D.cpp
+++ b/src/slic3r/GUI/GLCanvas3D.cpp
@@ -3683,16 +3683,6 @@ void GLCanvas3D::on_char(wxKeyEvent& evt)
         case WXK_CONTROL_E:
 #endif /* __APPLE__ */
         { m_labels.show(!m_labels.is_shown()); m_dirty = true; break; }
-#ifdef __APPLE__
-        case 'W':
-        case 'w':
-#else  /* __APPLE__ */
-        case WXK_CONTROL_W:
-#endif /* __APPLE__ */
-        {
-            wxGetApp().plater()->reset_window_layout();
-            break;
-        }
         case '0': {
             select_view("plate");
             zoom_to_bed();
diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp
index 863160aac..e888dfcf1 100644
--- a/src/slic3r/GUI/MainFrame.cpp
+++ b/src/slic3r/GUI/MainFrame.cpp
@@ -2897,11 +2897,6 @@ void MainFrame::init_menubar_as_editor()
             },
             this, [this]() { return m_tabpanel->GetSelection() == TabPosition::tp3DEditor || m_tabpanel->GetSelection() == TabPosition::tpPreview; },
             [this]() { return wxGetApp().show_3d_navigator(); }, this);
-        append_menu_item(
-            viewMenu, wxID_ANY, _L("Reset Window Layout") + "\t" + ctrl + "W", _L("Reset to default window layout"),
-            [this](wxCommandEvent &) { m_plater->reset_window_layout(); }, "", this,
-            [this]() { return (m_tabpanel->GetSelection() == TabPosition::tp3DEditor || m_tabpanel->GetSelection() == TabPosition::tpPreview) && m_plater->is_sidebar_enabled(); },
-            this);
         viewMenu->AppendSeparator();
         append_menu_check_item(viewMenu, wxID_ANY, _L("Show Labels") + "\t" + ctrl + "E", _L("Show object labels in 3D scene"),
             [this](wxCommandEvent&) { m_plater->show_view3D_labels(!m_plater->are_view3D_labels_shown()); m_plater->get_current_canvas3D()->post_event(SimpleEvent(wxEVT_PAINT)); }, this,
diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
index 2a18b8e3a..8d736abec 100644
--- a/src/slic3r/GUI/Plater.cpp
+++ b/src/slic3r/GUI/Plater.cpp
@@ -4351,7 +4351,7 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame)
     m_aui_mgr.SetDockSizeConstraint(1, 1);
     // m_aui_mgr.GetArtProvider()->SetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE, 0);
     // m_aui_mgr.GetArtProvider()->SetMetric(wxAUI_DOCKART_SASH_SIZE, 2);
-    m_aui_mgr.GetArtProvider()->SetMetric(wxAUI_DOCKART_CAPTION_SIZE, 8);
+    m_aui_mgr.GetArtProvider()->SetMetric(wxAUI_DOCKART_CAPTION_SIZE, 0);
     m_aui_mgr.GetArtProvider()->SetMetric(wxAUI_DOCKART_GRADIENT_TYPE, wxAUI_GRADIENT_NONE);
 
     this->q->SetFont(Slic3r::GUI::wxGetApp().normal_font());
@@ -4435,7 +4435,7 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame)
                                    .CloseButton(false)
                                    .TopDockable(false)
                                    .BottomDockable(false)
-                                   .Floatable(true)
+                                   //.Floatable(true)
                                    .Resizable(wxGetApp().app_config->get_bool("enable_sidebar_resizable"))
                                    .MinSize(wxSize(41 * wxGetApp().em_unit(), -1))
         .BestSize(wxSize(42 * wxGetApp().em_unit(), 90 * wxGetApp().em_unit())));