From db91857bda4b8ecf66469dbf3c0c8c5a41c84ef2 Mon Sep 17 00:00:00 2001 From: "xin.zhang" Date: Fri, 23 May 2025 18:57:15 +0800 Subject: [PATCH] FIX: do not popup if mode not changed jira: [STUDIO-12375] Change-Id: Ifc5ac737d49b7482de86f031bbc4bf2a6da6744e --- src/slic3r/GUI/Widgets/FanControl.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/slic3r/GUI/Widgets/FanControl.cpp b/src/slic3r/GUI/Widgets/FanControl.cpp index fe54623fd..5a18a0000 100644 --- a/src/slic3r/GUI/Widgets/FanControl.cpp +++ b/src/slic3r/GUI/Widgets/FanControl.cpp @@ -314,7 +314,7 @@ void FanOperate::doRender(wxDC& dc) //txt dc.SetFont(::Label::Body_12); - dc.SetTextForeground(StateColor::darkModeColorFor(wxColour(0x898989))); + dc.SetTextForeground(StateColor::darkModeColorFor(wxColour("#898989"))); wxString text = wxString::Format("%d%%", m_current_speeds * 10); wxSize text_size = dc.GetTextExtent(text); auto text_width = size.x - m_bitmap_decrease.GetBmpWidth() * 2; @@ -938,17 +938,17 @@ void FanControlPopupNew::paintEvent(wxPaintEvent& evt) void FanControlPopupNew::on_mode_changed(const wxMouseEvent &event) { - if (m_obj && m_obj->is_in_printing()) { - MessageDialog msg_wingow(nullptr, _L("The selected material only supports the current fan mode, and it can't be changed during printing."), "", wxICON_WARNING | wxOK); - msg_wingow.ShowModal(); - return; - } - size_t btn_list_size = m_mode_switch_btn_list.size(); for (size_t i = 0; i < btn_list_size; ++i) { if (m_mode_switch_btn_list[i]->GetId() == event.GetId()) { - if (m_mode_switch_btn_list[i]->isSelected()) + if (m_mode_switch_btn_list[i]->isSelected()) { return;} + + if (m_obj && m_obj->is_in_printing()) { + MessageDialog msg_wingow(nullptr, _L("The selected material only supports the current fan mode, and it can't be changed during printing."), "", wxICON_WARNING | wxOK); + msg_wingow.ShowModal(); return; + } + m_mode_switch_btn_list[i]->setSelected(true); command_control_air_duct(i); } else {