From 78daf90c9565326235fb9c30c2bd6503485c62ed Mon Sep 17 00:00:00 2001 From: Noisyfox Date: Sun, 17 May 2026 22:35:41 +0800 Subject: [PATCH] Show extruder switch in motion ability page --- src/slic3r/GUI/Tab.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index 1affaebc5c..b27345cf1e 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -486,23 +486,18 @@ void Tab::create_preset_tab() m_main_sizer->Add(m_tabctrl, 0, wxEXPAND | wxALL, 0 ); - // Orca: don't show extruder switch for now -#if 0 if (dynamic_cast(this) || dynamic_cast(this)) { m_extruder_switch = new SwitchButton(panel); m_extruder_switch->SetMaxSize({em_unit(this) * 24, -1}); m_extruder_switch->SetLabels(_L("Left"), _L("Right")); m_extruder_switch->Bind(wxEVT_TOGGLEBUTTON, [this] (auto & evt) { evt.Skip(); - dynamic_cast(this)->switch_excluder(evt.GetInt()); + switch_excluder(evt.GetInt()); reload_config(); update_changed_ui(); }); m_main_sizer->Add(m_extruder_switch, 0, wxALIGN_CENTER | wxTOP, m_em_unit); - } -#endif - - if (dynamic_cast(this)) { + } else if (dynamic_cast(this)) { m_variant_combo = new MultiSwitchButton(panel); m_variant_combo->Bind(wxCUSTOMEVT_MULTISWITCH_SELECTION, [this](auto &evt) { evt.Skip(); @@ -6491,7 +6486,7 @@ bool Tab::tree_sel_change_delayed(wxCommandEvent& event) m_active_page = page; if (m_extruder_switch) { - m_main_sizer->Show(m_extruder_switch, !m_active_page->m_opt_id_map.empty()); + m_main_sizer->Show(m_extruder_switch, m_extruder_switch->IsEnabled() && !m_active_page->m_opt_id_map.empty() && !m_active_page->title().StartsWith("Extruder")); GetParent()->Layout(); } else if (m_variant_combo) { m_main_sizer->Show(m_variant_combo, m_variant_combo->IsEnabled() && !m_active_page->m_opt_id_map.empty());