juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-14 20:47:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: bbl printer combox layout

Browse Source 
Change-Id: I7b82e0d989e0e197bb7644bbdc74927b308e9d89
Jira: STUDIO-12214
(cherry picked from commit e09410acce9ab64a62e4158b68f84570cda5c873)
This commit is contained in:
chunmao.guo
2025-05-15 16:21:17 +08:00
committed by Noisyfox
parent 44e62213e9
commit d79e6cf694
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -523,12 +523,12 @@ void Sidebar::priv::layout_printer(bool isBBL, bool isDual)
isDual = isDual && isBBL; // It indicates a multi-extruder layout. isDual = isDual && isBBL; // It indicates a multi-extruder layout.
// Printer - preset // Printer - preset
if (auto sizer = static_cast<wxBoxSizer *>(panel_printer_preset->GetSizer()); if (auto sizer = static_cast<wxBoxSizer *>(panel_printer_preset->GetSizer());
sizer == nullptr || isDual != (sizer->GetOrientation() == wxVERTICAL)) { sizer == nullptr || isBBL != (sizer->GetOrientation() == wxVERTICAL)) {
wxBoxSizer *hsizer_printer_btn = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer *hsizer_printer_btn = new wxBoxSizer(wxHORIZONTAL);
hsizer_printer_btn->AddStretchSpacer(1); hsizer_printer_btn->AddStretchSpacer(1);
hsizer_printer_btn->Add(btn_edit_printer, 0); hsizer_printer_btn->Add(btn_edit_printer, 0);
hsizer_printer_btn->Add(btn_connect_printer, 0, wxALIGN_CENTER | wxLEFT, FromDIP(4)); hsizer_printer_btn->Add(btn_connect_printer, 0, wxALIGN_CENTER | wxLEFT, FromDIP(4));
combo_printer->SetWindowStyle(combo_printer->GetWindowStyle() & ~wxALIGN_MASK | (isDual ? wxALIGN_CENTER_HORIZONTAL : wxALIGN_RIGHT)); combo_printer->SetWindowStyle(combo_printer->GetWindowStyle() & ~wxALIGN_MASK | (isBBL ? wxALIGN_CENTER_HORIZONTAL : wxALIGN_RIGHT));
if (isBBL) { if (isBBL) {
wxBoxSizer *vsizer = new wxBoxSizer(wxVERTICAL); wxBoxSizer *vsizer = new wxBoxSizer(wxVERTICAL);
wxBoxSizer *hsizer = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer *hsizer = new wxBoxSizer(wxHORIZONTAL);
@@ -1657,7 +1657,7 @@ Sidebar::Sidebar(Plater *parent)
p->panel_printer_bed = new StaticBox(p->m_panel_printer_content); p->panel_printer_bed = new StaticBox(p->m_panel_printer_content);
p->panel_printer_bed->SetCornerRadius(8); p->panel_printer_bed->SetCornerRadius(8);
p->panel_printer_bed->SetBorderColor(panel_bd_col); p->panel_printer_bed->SetBorderColor(panel_bd_col);
p->panel_printer_bed->SetMinSize(PRINTER_PANEL_SIZE_WIDEN); p->panel_printer_bed->SetMinSize(PRINTER_PANEL_SIZE_SMALL);
p->panel_printer_bed->Bind(wxEVT_LEFT_DOWN, [this](auto &evt) { p->panel_printer_bed->Bind(wxEVT_LEFT_DOWN, [this](auto &evt) {
p->combo_printer_bed->wxEvtHandler::ProcessEvent(evt); p->combo_printer_bed->wxEvtHandler::ProcessEvent(evt);
}); });
@@ -2558,7 +2558,7 @@ void Sidebar::msw_rescale()
p->btn_sync_printer->SetPaddingSize({FromDIP(6), FromDIP(12)}); p->btn_sync_printer->SetPaddingSize({FromDIP(6), FromDIP(12)});
p->btn_sync_printer->SetMinSize(PRINTER_PANEL_SIZE); p->btn_sync_printer->SetMinSize(PRINTER_PANEL_SIZE);
p->btn_sync_printer->SetMaxSize(PRINTER_PANEL_SIZE); p->btn_sync_printer->SetMaxSize(PRINTER_PANEL_SIZE);
p->panel_printer_bed->SetMinSize(PRINTER_PANEL_SIZE_WIDEN); p->panel_printer_bed->SetMinSize(PRINTER_PANEL_SIZE_SMALL);
p->btn_sync_printer->Rescale(); p->btn_sync_printer->Rescale();
#if 0 #if 0
if (p->mode_sizer) if (p->mode_sizer)