From 36deba9d131b9433998e3fd1c2f96f785d6a6e0a Mon Sep 17 00:00:00 2001 From: "xin.zhang" Date: Thu, 23 Jan 2025 17:43:48 +0800 Subject: [PATCH] FIX: the dpi changed display of bed control jira: [STUDIO-10067] Change-Id: I84a2763686b004cfb27ddb567b0f6a44577924b0 --- src/slic3r/GUI/StatusPanel.cpp | 18 +++++++++++------- src/slic3r/GUI/Widgets/Button.cpp | 1 + 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp index db502c2a7..196e81cb0 100644 --- a/src/slic3r/GUI/StatusPanel.cpp +++ b/src/slic3r/GUI/StatusPanel.cpp @@ -1611,7 +1611,7 @@ wxPanel *StatusBasePanel::create_bed_control(wxWindow *parent) m_bpButton_z_10->SetBorderColor(z_10_ctrl_bd); m_bpButton_z_10->SetTextColor(StateColor(std::make_pair(DISCONNECT_TEXT_COL, (int) StateColor::Disabled), std::make_pair(NORMAL_TEXT_COL, (int) StateColor::Normal))); m_bpButton_z_10->SetMinSize(Z_BUTTON_SIZE); - m_bpButton_z_10->SetMaxSize(Z_BUTTON_SIZE); + m_bpButton_z_10->SetSize(Z_BUTTON_SIZE); m_bpButton_z_10->SetCornerRadius(0); m_bpButton_z_1 = new Button(panel, wxString(" 1"), "monitor_bed_up", 0, FromDIP(15)); m_bpButton_z_1->SetFont(::Label::Body_12); @@ -1619,7 +1619,7 @@ wxPanel *StatusBasePanel::create_bed_control(wxWindow *parent) m_bpButton_z_1->SetBackgroundColor(z_1_ctrl_bg); m_bpButton_z_1->SetBorderColor(z_1_ctrl_bd); m_bpButton_z_1->SetMinSize(Z_BUTTON_SIZE); - m_bpButton_z_1->SetMaxSize(Z_BUTTON_SIZE); + m_bpButton_z_1->SetSize(Z_BUTTON_SIZE); m_bpButton_z_1->SetTextColor(StateColor(std::make_pair(DISCONNECT_TEXT_COL, (int) StateColor::Disabled), std::make_pair(NORMAL_TEXT_COL, (int) StateColor::Normal))); //bSizer_z_ctrl->Add(0, FromDIP(6), 0, wxEXPAND, 0); @@ -1647,11 +1647,11 @@ wxPanel *StatusBasePanel::create_bed_control(wxWindow *parent) m_bpButton_z_down_10->SetSize(Z_BUTTON_SIZE); m_bpButton_z_down_10->SetTextColor(StateColor(std::make_pair(DISCONNECT_TEXT_COL, (int) StateColor::Disabled), std::make_pair(NORMAL_TEXT_COL, (int) StateColor::Normal))); - bSizer_z_ctrl->Add(m_bpButton_z_10, 0, wxEXPAND | wxALL, 0); - bSizer_z_ctrl->Add(m_bpButton_z_1, 0, wxEXPAND | wxALL, 0); - bSizer_z_ctrl->Add(m_staticText_z_tip, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, FromDIP(17)); - bSizer_z_ctrl->Add(m_bpButton_z_down_1, 0, wxEXPAND | wxALL, 0); - bSizer_z_ctrl->Add(m_bpButton_z_down_10, 0, wxEXPAND | wxALL, 0); + bSizer_z_ctrl->Add(m_bpButton_z_10, 0, wxEXPAND | wxLEFT | wxRIGHT, 0); + bSizer_z_ctrl->Add(m_bpButton_z_1, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(2)); + bSizer_z_ctrl->Add(m_staticText_z_tip, 0, wxALIGN_CENTRE, FromDIP(5)); + bSizer_z_ctrl->Add(m_bpButton_z_down_1, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(2)); + bSizer_z_ctrl->Add(m_bpButton_z_down_10, 0, wxEXPAND | wxLEFT | wxRIGHT, 0); panel->SetSizer(bSizer_z_ctrl); panel->Layout(); @@ -4971,6 +4971,10 @@ void StatusPanel::msw_rescale() //m_switch_fan->SetImages(m_bitmap_fan_on, m_bitmap_fan_off); //m_switch_fan->Rescale(); + m_bpButton_z_10->Rescale(); + m_bpButton_z_1->Rescale(); + m_bpButton_z_down_1->Rescale(); + m_bpButton_z_down_10->Rescale(); m_ams_control->msw_rescale(); // m_filament_step->Rescale(); diff --git a/src/slic3r/GUI/Widgets/Button.cpp b/src/slic3r/GUI/Widgets/Button.cpp index deba20d9b..41f4fd0a5 100644 --- a/src/slic3r/GUI/Widgets/Button.cpp +++ b/src/slic3r/GUI/Widgets/Button.cpp @@ -167,6 +167,7 @@ void Button::Rescale() this->inactive_icon.msw_rescale(); messureSize(); + Refresh(); } void Button::paintEvent(wxPaintEvent& evt)