From 88eb2ab8df90c8a6996df17ebee16d97f328831d Mon Sep 17 00:00:00 2001 From: SoftFever Date: Fri, 27 Mar 2026 14:53:56 +0800 Subject: [PATCH] reapply wxALIGN_CENTER_VERTICAL --- src/slic3r/GUI/AMSMaterialsSetting.cpp | 4 ++-- src/slic3r/GUI/CameraPopup.cpp | 2 +- src/slic3r/GUI/CloneDialog.cpp | 4 ++-- src/slic3r/GUI/UpgradePanel.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/slic3r/GUI/AMSMaterialsSetting.cpp b/src/slic3r/GUI/AMSMaterialsSetting.cpp index 034008a8fd..19a32c2d21 100644 --- a/src/slic3r/GUI/AMSMaterialsSetting.cpp +++ b/src/slic3r/GUI/AMSMaterialsSetting.cpp @@ -334,7 +334,7 @@ void AMSMaterialsSetting::create_panel_kn(wxWindow* parent) m_input_k_val->SetMinSize(wxSize(FromDIP(245), -1)); m_input_k_val->SetMaxSize(wxSize(FromDIP(245), -1)); m_input_k_val->GetTextCtrl()->SetValidator(wxTextValidator(wxFILTER_NUMERIC)); - kn_val_sizer->Add(m_input_k_val, 0, wxALL | wxEXPAND, FromDIP(0)); + kn_val_sizer->Add(m_input_k_val, 0, wxALL | wxEXPAND | wxALIGN_CENTER_VERTICAL, FromDIP(0)); // n params input wxBoxSizer* n_sizer = new wxBoxSizer(wxHORIZONTAL); @@ -345,7 +345,7 @@ void AMSMaterialsSetting::create_panel_kn(wxWindow* parent) kn_val_sizer->Add(m_n_param, 1, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5)); m_input_n_val = new TextInput(parent, wxEmptyString, wxEmptyString, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_CENTRE | wxTE_PROCESS_ENTER); m_input_n_val->GetTextCtrl()->SetValidator(wxTextValidator(wxFILTER_NUMERIC)); - kn_val_sizer->Add(m_input_n_val, 0, wxALL | wxEXPAND, FromDIP(5)); + kn_val_sizer->Add(m_input_n_val, 0, wxALL | wxEXPAND | wxALIGN_CENTER_VERTICAL, FromDIP(5)); m_n_param->Hide(); m_input_n_val->Hide(); diff --git a/src/slic3r/GUI/CameraPopup.cpp b/src/slic3r/GUI/CameraPopup.cpp index 84a70605c8..f201cc2dfd 100644 --- a/src/slic3r/GUI/CameraPopup.cpp +++ b/src/slic3r/GUI/CameraPopup.cpp @@ -128,7 +128,7 @@ CameraPopup::CameraPopup(wxWindow *parent) top_sizer->Add(m_custom_camera_hint, 0, wxALIGN_CENTER_VERTICAL | wxALIGN_LEFT | wxALL, FromDIP(5)); top_sizer->Add(0, 0, wxALL, 0); - top_sizer->Add(m_custom_camera_input, 2, wxEXPAND | wxALL, FromDIP(5)); + top_sizer->Add(m_custom_camera_input, 2, wxALIGN_CENTER_VERTICAL | wxEXPAND | wxALL, FromDIP(5)); top_sizer->Add(m_custom_camera_input_confirm, 1, wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT | wxALL, FromDIP(5)); main_sizer->Add(top_sizer, 0, wxALL, FromDIP(10)); diff --git a/src/slic3r/GUI/CloneDialog.cpp b/src/slic3r/GUI/CloneDialog.cpp index 4e3579070e..b5f506ae4e 100644 --- a/src/slic3r/GUI/CloneDialog.cpp +++ b/src/slic3r/GUI/CloneDialog.cpp @@ -26,7 +26,7 @@ CloneDialog::CloneDialog(wxWindow *parent) ProcessEventLocally(e); e.Skip(); }); - f_sizer->Add(count_label , 0, wxEXPAND); + f_sizer->Add(count_label , 0, wxEXPAND | wxALIGN_CENTER_VERTICAL); f_sizer->Add(m_count_spin, 0, wxALIGN_CENTER_VERTICAL); auto arrange_label = new wxStaticText(this, wxID_ANY, _L("Auto arrange plate after cloning") + ":", wxDefaultPosition, wxDefaultSize, 0); @@ -34,7 +34,7 @@ CloneDialog::CloneDialog(wxWindow *parent) m_arrange_cb = new ::CheckBox(this); m_arrange_cb->SetValue(m_config->get("auto_arrange") == "true"); - f_sizer->Add(arrange_label, 0, wxEXPAND); + f_sizer->Add(arrange_label, 0, wxEXPAND | wxALIGN_CENTER_VERTICAL); f_sizer->Add(m_arrange_cb , 0, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM, FromDIP(5)); v_sizer->Add(f_sizer, 1, wxEXPAND | wxALL, FromDIP(10)); diff --git a/src/slic3r/GUI/UpgradePanel.cpp b/src/slic3r/GUI/UpgradePanel.cpp index e4120ad70e..3a42f7343d 100644 --- a/src/slic3r/GUI/UpgradePanel.cpp +++ b/src/slic3r/GUI/UpgradePanel.cpp @@ -84,7 +84,7 @@ MachineInfoPanel::MachineInfoPanel(wxWindow* parent, wxWindowID id, const wxPoin m_staticText_sn = new wxStaticText(this, wxID_ANY, _L("Serial:"), wxDefaultPosition, wxDefaultSize, 0); m_staticText_sn->Wrap(-1); m_staticText_sn->SetFont(Label::Head_14); - m_ota_info_sizer->Add(m_staticText_sn, 0, wxALL | wxEXPAND, FromDIP(5)); + m_ota_info_sizer->Add(m_staticText_sn, 0, wxALIGN_RIGHT | wxALL | wxEXPAND, FromDIP(5)); m_staticText_sn_val = new wxStaticText(this, wxID_ANY, "-", wxDefaultPosition, wxDefaultSize, 0); m_staticText_sn_val->Wrap(-1);