From 63506ab13e34ec7ce8a1430bcf9770b494835b9c Mon Sep 17 00:00:00 2001 From: mixian Date: Thu, 20 Mar 2025 17:28:10 +0800 Subject: [PATCH] FIX: move editbtn left for badge Jira: none Change-Id: I8991d83856edb61fe82cd21df77bef2a69eefa03 --- src/slic3r/GUI/Plater.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 7d4b4b1bc..c8a37179c 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -518,9 +518,10 @@ void Sidebar::priv::layout_printer(bool isBBL, bool isDual) if (isDual) { wxBoxSizer *vsizer = new wxBoxSizer(wxVERTICAL); wxBoxSizer *hsizer = new wxBoxSizer(wxHORIZONTAL); - hsizer->Add(hsizer_printer_btn, 0, wxALIGN_TOP | wxTOP | wxLEFT, 0); - hsizer->Add(image_printer, 1, wxEXPAND | wxTOP, FromDIP(8)); - hsizer->AddSpacer(FromDIP(4)); + hsizer->AddStretchSpacer(1); + hsizer->Add(image_printer, 1, wxEXPAND | wxTOP, FromDIP(8)); + hsizer->Add(hsizer_printer_btn, 1, wxEXPAND, 0); + hsizer->AddSpacer(FromDIP(6)); vsizer->AddSpacer(FromDIP(4)); vsizer->Add(hsizer, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(8)); vsizer->Add(combo_printer, 0, wxEXPAND | wxALL, FromDIP(4)); @@ -528,11 +529,10 @@ void Sidebar::priv::layout_printer(bool isBBL, bool isDual) panel_printer_bed->SetMinSize(PRINTER_PANEL_SIZE_SMALL); } else { wxBoxSizer *hsizer = new wxBoxSizer(wxHORIZONTAL); - hsizer->AddSpacer(FromDIP(4)); - hsizer->Add(hsizer_printer_btn, 0, wxALIGN_TOP | wxTOP | wxLEFT, FromDIP(4)); hsizer->Add(image_printer, 0, wxLEFT | wxALIGN_CENTER, FromDIP(4)); hsizer->Add(combo_printer, 1, wxALIGN_CENTRE | wxLEFT | wxRIGHT, FromDIP(6)); - hsizer->AddSpacer(FromDIP(8)); + hsizer->Add(hsizer_printer_btn, 0, wxALIGN_TOP | wxTOP | wxRIGHT, FromDIP(4)); + hsizer->AddSpacer(FromDIP(10)); panel_printer_preset->SetSizer(hsizer); panel_printer_bed->SetMinSize(PRINTER_PANEL_SIZE_WIDEN); } @@ -1552,7 +1552,6 @@ Sidebar::Sidebar(Plater *parent) p->editing_filament = 0; }); p->btn_edit_printer = edit_btn; - ScalableBitmap bitmap_printer(p->panel_printer_preset, "printer_placeholder", 48); p->image_printer = new wxStaticBitmap(p->panel_printer_preset, wxID_ANY, bitmap_printer.bmp(), wxDefaultPosition, PRINTER_THUMBNAIL_SIZE, 0); p->image_printer->Bind(wxEVT_LEFT_DOWN, [this](auto &evt) {