mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: move editbtn left for badge 

Jira: none
Change-Id: I8991d83856edb61fe82cd21df77bef2a69eefa03
This commit is contained in:
mixian 2025-03-20 17:28:10 +08:00 committed by lane.wei
parent 61f61bce3e
commit 63506ab13e
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/slic3r/GUI/Plater.cpp
View File

@ -518,9 +518,10 @@ void Sidebar::priv::layout_printer(bool isBBL, bool isDual)
if (isDual) { if (isDual) {
wxBoxSizer *vsizer = new wxBoxSizer(wxVERTICAL); wxBoxSizer *vsizer = new wxBoxSizer(wxVERTICAL);
wxBoxSizer *hsizer = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer *hsizer = new wxBoxSizer(wxHORIZONTAL);
hsizer->Add(hsizer_printer_btn, 0, wxALIGN_TOP | wxTOP | wxLEFT, 0); hsizer->AddStretchSpacer(1);
hsizer->Add(image_printer, 1, wxEXPAND | wxTOP, FromDIP(8)); hsizer->Add(image_printer, 1, wxEXPAND | wxTOP, FromDIP(8));
hsizer->AddSpacer(FromDIP(4)); hsizer->Add(hsizer_printer_btn, 1, wxEXPAND, 0);
hsizer->AddSpacer(FromDIP(6));
vsizer->AddSpacer(FromDIP(4)); vsizer->AddSpacer(FromDIP(4));
vsizer->Add(hsizer, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(8)); vsizer->Add(hsizer, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(8));
vsizer->Add(combo_printer, 0, wxEXPAND | wxALL, FromDIP(4)); 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); panel_printer_bed->SetMinSize(PRINTER_PANEL_SIZE_SMALL);
} else { } else {
wxBoxSizer *hsizer = new wxBoxSizer(wxHORIZONTAL); 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(image_printer, 0, wxLEFT | wxALIGN_CENTER, FromDIP(4));
hsizer->Add(combo_printer, 1, wxALIGN_CENTRE | wxLEFT | wxRIGHT, FromDIP(6)); 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_preset->SetSizer(hsizer);
panel_printer_bed->SetMinSize(PRINTER_PANEL_SIZE_WIDEN); panel_printer_bed->SetMinSize(PRINTER_PANEL_SIZE_WIDEN);
} }
@ -1552,7 +1552,6 @@ Sidebar::Sidebar(Plater *parent)
p->editing_filament = 0; p->editing_filament = 0;
}); });
p->btn_edit_printer = edit_btn; p->btn_edit_printer = edit_btn;
ScalableBitmap bitmap_printer(p->panel_printer_preset, "printer_placeholder", 48); 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 = 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) { p->image_printer->Bind(wxEVT_LEFT_DOWN, [this](auto &evt) {