From f0b0f2109057321204402bb45a1755eab5f2c658 Mon Sep 17 00:00:00 2001 From: "zhimin.zeng" Date: Wed, 4 Sep 2024 12:13:43 +0800 Subject: [PATCH] FIX: recover delete filament button jira: none Change-Id: I4972883081e424f5e0ac1c60a7cfc28d5248f442 (cherry picked from commit c1bf153a19153830601d425d5b3ba7bd2a10f11d) --- src/slic3r/GUI/Plater.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 3a4d40408d..dc80e92784 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -1129,14 +1129,14 @@ Sidebar::Sidebar(Plater *parent) // ORCA Moved add button after delete button to prevent add button position change when remove icon automatically hidden - //ScalableButton* del_btn = new ScalableButton(p->m_panel_filament_title, wxID_ANY, "delete_filament"); - //del_btn->SetToolTip(_L("Remove last filament")); - //del_btn->Bind(wxEVT_BUTTON, [this, scrolled_sizer](wxCommandEvent &e) { - // delete_filament(); - //}); - //p->m_bpButton_del_filament = del_btn; + ScalableButton* del_btn = new ScalableButton(p->m_panel_filament_title, wxID_ANY, "delete_filament"); + del_btn->SetToolTip(_L("Remove last filament")); + del_btn->Bind(wxEVT_BUTTON, [this, scrolled_sizer](wxCommandEvent &e) { + delete_filament(); + }); + p->m_bpButton_del_filament = del_btn; - //bSizer39->Add(del_btn, 0, wxALIGN_CENTER | wxLEFT, FromDIP(SidebarProps::IconSpacing())); + bSizer39->Add(del_btn, 0, wxALIGN_CENTER_VERTICAL, FromDIP(5)); bSizer39->Add(add_btn, 0, wxALIGN_CENTER | wxLEFT, FromDIP(SidebarProps::IconSpacing())); // ORCA Moved add button after delete button to prevent add button position change when remove icon automatically hidden bSizer39->AddSpacer(FromDIP(20)); @@ -1712,7 +1712,7 @@ void Sidebar::sys_color_changed() p->m_printer_setting->msw_rescale(); p->m_filament_icon->msw_rescale(); p->m_bpButton_add_filament->msw_rescale(); - //p->m_bpButton_del_filament->msw_rescale(); + p->m_bpButton_del_filament->msw_rescale(); p->m_bpButton_ams_filament->msw_rescale(); p->m_bpButton_set_filament->msw_rescale(); p->m_flushing_volume_btn->Rescale();