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

FIX: Align printer preset controls in sidebar

Browse Source 
jira: STUDIO-12397
Change-Id: I728d84b8862de0a72ef467388cbf4c63b24fdcc8
(cherry picked from commit 7ceff77207916b059aa1add0f9869d0e55a59023)
This commit is contained in:
fei2.fang
2025-06-04 14:58:07 +08:00
committed by Noisyfox
parent a776c9ae56
commit 008a98ccda
1 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -209,10 +209,8 @@ wxDEFINE_EVENT(EVT_ADD_CUSTOM_FILAMENT, ColorEvent);
wxDEFINE_EVENT(EVT_NOTICE_CHILDE_SIZE_CHANGED, SimpleEvent); wxDEFINE_EVENT(EVT_NOTICE_CHILDE_SIZE_CHANGED, SimpleEvent);
wxDEFINE_EVENT(EVT_NOTICE_FULL_SCREEN_CHANGED, IntEvent); wxDEFINE_EVENT(EVT_NOTICE_FULL_SCREEN_CHANGED, IntEvent);
#define PRINTER_THUMBNAIL_SIZE (wxSize(FromDIP(48), FromDIP(48))) #define PRINTER_THUMBNAIL_SIZE (wxSize(FromDIP(48), FromDIP(48)))
#define PRINTER_THUMBNAIL_SIZE_SMALL (wxSize(FromDIP(32), FromDIP(32))) #define PRINTER_PANEL_SIZE (wxSize(FromDIP(96), FromDIP(68)))
#define PRINTER_PANEL_SIZE_SMALL (wxSize(FromDIP(98), FromDIP(68))) #define BTN_SYNC_SIZE (wxSize(FromDIP(96), FromDIP(98)))
#define PRINTER_PANEL_SIZE_WIDEN (wxSize(FromDIP(136), FromDIP(68)))
#define PRINTER_PANEL_SIZE (wxSize(FromDIP(98), FromDIP(98)))
static string get_diameter_string(float diameter) static string get_diameter_string(float diameter)
{ {
@@ -561,13 +559,12 @@ void Sidebar::priv::layout_printer(bool isBBL, bool isDual)
// double // double
auto hsizer_extruder = new wxBoxSizer(wxHORIZONTAL); auto hsizer_extruder = new wxBoxSizer(wxHORIZONTAL);
hsizer_extruder->Add(left_extruder->sizer, 1, wxEXPAND, 0);
hsizer_extruder->AddSpacer(FromDIP(4)); hsizer_extruder->AddSpacer(FromDIP(4));
hsizer_extruder->Add(left_extruder->sizer, 1, wxEXPAND); hsizer_extruder->Add(right_extruder->sizer, 1, wxEXPAND, 0);
hsizer_extruder->Add(right_extruder->sizer, 1, wxLEFT | wxEXPAND, FromDIP(4));
hsizer_extruder->AddSpacer(FromDIP(4));
// single // single
vsizer_printer->Add(hsizer_extruder, 0, wxEXPAND | wxLEFT, 0); vsizer_printer->Add(hsizer_extruder, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(4));
vsizer_printer->Add(single_extruder->sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(4)); vsizer_printer->Add(single_extruder->sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(4));
vsizer_printer->AddSpacer(FromDIP(4)); vsizer_printer->AddSpacer(FromDIP(4));
@@ -1622,7 +1619,7 @@ Sidebar::Sidebar(Plater *parent)
p->panel_printer_preset = new StaticBox(p->m_panel_printer_content); p->panel_printer_preset = new StaticBox(p->m_panel_printer_content);
p->panel_printer_preset->SetCornerRadius(8); p->panel_printer_preset->SetCornerRadius(8);
p->panel_printer_preset->SetBorderColor(panel_bd_col); p->panel_printer_preset->SetBorderColor(panel_bd_col);
p->panel_printer_preset->SetMinSize(PRINTER_PANEL_SIZE_SMALL); p->panel_printer_preset->SetMinSize(PRINTER_PANEL_SIZE);
p->panel_printer_preset->Bind(wxEVT_LEFT_DOWN, [this](auto & evt) { p->panel_printer_preset->Bind(wxEVT_LEFT_DOWN, [this](auto & evt) {
p->combo_printer->wxEvtHandler::ProcessEvent(evt); p->combo_printer->wxEvtHandler::ProcessEvent(evt);
}); });
@@ -1668,7 +1665,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_SMALL); p->panel_printer_bed->SetMinSize(PRINTER_PANEL_SIZE);
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);
}); });
@@ -1760,8 +1757,8 @@ Sidebar::Sidebar(Plater *parent)
btn_sync->SetBorderColor(btn_sync_bd_col); btn_sync->SetBorderColor(btn_sync_bd_col);
btn_sync->SetCanFocus(false); btn_sync->SetCanFocus(false);
btn_sync->SetPaddingSize({FromDIP(6), FromDIP(12)}); btn_sync->SetPaddingSize({FromDIP(6), FromDIP(12)});
btn_sync->SetMinSize(PRINTER_PANEL_SIZE); btn_sync->SetMinSize(BTN_SYNC_SIZE);
btn_sync->SetMaxSize(PRINTER_PANEL_SIZE); btn_sync->SetMaxSize(BTN_SYNC_SIZE);
btn_sync->SetVertical(); btn_sync->SetVertical();
btn_sync->Bind(wxEVT_UPDATE_UI, &Sidebar::update_sync_ams_btn_enable, this); btn_sync->Bind(wxEVT_UPDATE_UI, &Sidebar::update_sync_ams_btn_enable, this);
btn_sync->Bind(wxEVT_BUTTON, [this](wxCommandEvent &e) { btn_sync->Bind(wxEVT_BUTTON, [this](wxCommandEvent &e) {
@@ -2569,9 +2566,8 @@ void Sidebar::msw_rescale()
p->single_extruder->Rescale(); p->single_extruder->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(BTN_SYNC_SIZE);
p->btn_sync_printer->SetMaxSize(PRINTER_PANEL_SIZE); p->panel_printer_bed->SetMinSize(PRINTER_PANEL_SIZE);
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)