From bf3974f6d06468289bd2aed8adae17e4c7b9e3f9 Mon Sep 17 00:00:00 2001 From: tao wang Date: Wed, 6 Sep 2023 20:25:50 +0800 Subject: [PATCH] ENH:update the style of the noise fan jira:[STUDIO-4078] Change-Id: Ibe42a25cc73010efac9d0d9d767153ec8090cb75 --- src/slic3r/GUI/StatusPanel.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp index 1f2ac910f..18c47d218 100644 --- a/src/slic3r/GUI/StatusPanel.cpp +++ b/src/slic3r/GUI/StatusPanel.cpp @@ -106,6 +106,7 @@ static std::vector message_containing_done{ #define TASK_BUTTON_SIZE2 (wxSize(-1, FromDIP(24))) #define Z_BUTTON_SIZE (wxSize(FromDIP(52), FromDIP(52))) #define MISC_BUTTON_PANEL_SIZE (wxSize(FromDIP(136), FromDIP(55))) +#define MISC_BUTTON_1FAN_SIZE (wxSize(FromDIP(132), FromDIP(51))) #define MISC_BUTTON_2FAN_SIZE (wxSize(FromDIP(66), FromDIP(51))) #define MISC_BUTTON_3FAN_SIZE (wxSize(FromDIP(44), FromDIP(51))) #define TEMP_CTRL_MIN_SIZE (wxSize(FromDIP(122), FromDIP(52))) @@ -1164,14 +1165,14 @@ wxBoxSizer *StatusBasePanel::create_misc_control(wxWindow *parent) m_fan_panel->SetBackgroundColor(parent->GetBackgroundColour()); }); - m_switch_block_fan = new wxPanel(m_fan_panel); - m_switch_block_fan->SetBackgroundColour(parent->GetBackgroundColour()); + //m_switch_block_fan = new wxPanel(m_fan_panel); + //m_switch_block_fan->SetBackgroundColour(parent->GetBackgroundColour()); fan_line_sizer->Add(0, 0, 0, wxLEFT, FromDIP(2)); fan_line_sizer->Add(m_switch_nozzle_fan, 0, wxALIGN_CENTER | wxTOP | wxBOTTOM , FromDIP(2)); fan_line_sizer->Add(m_switch_printing_fan, 0, wxALIGN_CENTER | wxTOP | wxBOTTOM, FromDIP(2)); fan_line_sizer->Add(m_switch_cham_fan, 0, wxALIGN_CENTER | wxTOP | wxBOTTOM , FromDIP(2)); - fan_line_sizer->Add(m_switch_block_fan, 1, wxEXPAND | wxTOP | wxBOTTOM , FromDIP(2)); + //fan_line_sizer->Add(m_switch_block_fan, 1, wxEXPAND | wxTOP | wxBOTTOM , FromDIP(2)); fan_line_sizer->Add(0, 0, 0, wxLEFT, FromDIP(2)); m_fan_panel->SetSizer(fan_line_sizer); @@ -2179,6 +2180,12 @@ void StatusPanel::update_misc_ctrl(MachineObject *obj) m_misc_ctrl_sizer->Layout(); } + if (!is_suppt_aux_fun && !is_suppt_cham_fun) { + m_switch_nozzle_fan->SetMinSize(MISC_BUTTON_1FAN_SIZE); + m_switch_nozzle_fan->SetMaxSize(MISC_BUTTON_1FAN_SIZE); + m_misc_ctrl_sizer->Layout(); + } + // nozzle fan if (m_switch_nozzle_fan_timeout > 0) {