From ce65273dc0fc9bc3f23dc54b01e4dcc92d92483c Mon Sep 17 00:00:00 2001 From: "zhimin.zeng" Date: Mon, 10 Feb 2025 20:36:17 +0800 Subject: [PATCH] FIX: fix some size error on dpi changed jira: TUDIO-10053 Change-Id: Icd93aa0dd9a2c693d7b957f9ede5c6dafc415352 --- src/slic3r/GUI/AMSMaterialsSetting.cpp | 1 + .../GUI/CalibrationWizardPresetPage.cpp | 22 +++++++++++++++++++ .../GUI/CalibrationWizardPresetPage.hpp | 4 ++++ 3 files changed, 27 insertions(+) diff --git a/src/slic3r/GUI/AMSMaterialsSetting.cpp b/src/slic3r/GUI/AMSMaterialsSetting.cpp index 3ebf35aa1..92ba54557 100644 --- a/src/slic3r/GUI/AMSMaterialsSetting.cpp +++ b/src/slic3r/GUI/AMSMaterialsSetting.cpp @@ -1353,6 +1353,7 @@ void AMSMaterialsSetting::on_dpi_changed(const wxRect &suggested_rect) { m_input_nozzle_max->GetTextCtrl()->SetSize(wxSize(-1, FromDIP(20))); m_input_nozzle_min->GetTextCtrl()->SetSize(wxSize(-1, FromDIP(20))); + m_input_k_val->GetTextCtrl()->SetSize(wxSize(-1, FromDIP(20))); //m_clr_picker->msw_rescale(); degree->msw_rescale(); bitmap_max_degree->SetBitmap(degree->bmp()); diff --git a/src/slic3r/GUI/CalibrationWizardPresetPage.cpp b/src/slic3r/GUI/CalibrationWizardPresetPage.cpp index cab279b4e..c1151a43b 100644 --- a/src/slic3r/GUI/CalibrationWizardPresetPage.cpp +++ b/src/slic3r/GUI/CalibrationWizardPresetPage.cpp @@ -7,6 +7,7 @@ #define CALIBRATION_LABEL_SIZE wxSize(FromDIP(150), FromDIP(24)) #define SYNC_BUTTON_SIZE (wxSize(FromDIP(50), FromDIP(50))) +#define CALIBRATION_TEXT_INPUT_Y_SIZE FromDIP(20) #define LEFT_EXTRUDER_ID 1 #define RIGHT_EXTRUDER_ID 0 @@ -33,6 +34,11 @@ CaliPresetCaliStagePanel::CaliPresetCaliStagePanel( m_top_sizer->Fit(this); } +void CaliPresetCaliStagePanel::msw_rescale() +{ + flow_ratio_input->GetTextCtrl()->SetSize(wxSize(-1, CALIBRATION_TEXT_INPUT_Y_SIZE)); +} + void CaliPresetCaliStagePanel::create_panel(wxWindow* parent) { auto title = new Label(parent, _L("Calibration Type")); @@ -274,6 +280,12 @@ CaliPresetCustomRangePanel::CaliPresetCustomRangePanel( m_top_sizer->Fit(this); } +void CaliPresetCustomRangePanel::msw_rescale() +{ + for (TextInput *value_input : m_value_inputs) + value_input->GetTextCtrl()->SetSize(wxSize(-1, CALIBRATION_TEXT_INPUT_Y_SIZE)); +} + void CaliPresetCustomRangePanel::set_unit(wxString unit) { for (size_t i = 0; i < m_input_value_nums; ++i) { @@ -512,6 +524,16 @@ void CalibrationPresetPage::msw_rescale() for (auto& comboBox : m_filament_comboBox_list) { comboBox->msw_rescale(); } + + for (AMSPreview *ams_item : m_main_ams_preview_list) + ams_item->msw_rescale(); + for (AMSPreview *ams_item : m_deputy_ams_preview_list) + ams_item->msw_rescale(); + for (AMSPreview *ams_item : m_ams_preview_list) + ams_item->msw_rescale(); + + m_cali_stage_panel->msw_rescale(); + m_custom_range_panel->msw_rescale(); } void CalibrationPresetPage::on_sys_color_changed() diff --git a/src/slic3r/GUI/CalibrationWizardPresetPage.hpp b/src/slic3r/GUI/CalibrationWizardPresetPage.hpp index fd55464cc..2ccb6550a 100644 --- a/src/slic3r/GUI/CalibrationWizardPresetPage.hpp +++ b/src/slic3r/GUI/CalibrationWizardPresetPage.hpp @@ -28,6 +28,8 @@ public: long style = wxTAB_TRAVERSAL); void create_panel(wxWindow* parent); + void msw_rescale(); + void set_cali_stage(CaliPresetStage stage, float value); void get_cali_stage(CaliPresetStage& stage, float& value); @@ -121,6 +123,8 @@ public: void create_panel(wxWindow* parent); + void msw_rescale(); + void set_unit(wxString unit); void set_titles(wxArrayString titles); void set_values(wxArrayString values);