juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-08-30 13:26:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: update the fan panel

Browse Source 
jira: [STUDIO-10499]
Change-Id: I5b760946229ea1cb24802ddddce250cc276986d6
(cherry picked from commit 418370ca5cde3a174ed7a9404413f61a62e214e9)
This commit is contained in:
xin.zhang
2025-02-18 17:07:15 +08:00
committed by Noisyfox
parent 1c14814246
commit ae7438f249
3 changed files with 36 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/slic3r/GUI/Widgets/ImageSwitchButton.cpp
View File

@@ -278,21 +278,23 @@ void FanSwitchButton::render(wxDC& dc)
if (icon.bmp().IsOk()) {
dc.DrawBitmap(icon.bmp(), pt);
pt.x += icon.GetBmpWidth() + FromDIP(9);
}
wxString fan_txt = _L("Fan");
dc.SetFont(::Label::Head_15);
pt.y = FromDIP(9);
dc.DrawText(fan_txt, pt);
pt.y = size.y / 2 + FromDIP(3);
wxString fan_num_txt = GetLabel();
dc.SetFont(::Label::Body_12);
dc.SetTextForeground(0x6b6b6b);
dc.DrawText(fan_num_txt, pt);
if (!m_text.empty())
{
if (m_text == _L("Fan")) {
dc.SetFont(::Label::Head_15);
pt.x += icon.GetBmpWidth() + FromDIP(9);
} else if (m_text == _L("Air Condition")) {
dc.SetFont(::Label::Head_14);
pt.x += icon.GetBmpWidth() + FromDIP(6);
}
auto text_size = dc.GetMultiLineTextExtent(m_text);
pt.y = (size.y - text_size.GetHeight()) / 2;
//dc.SetTextForeground(0x6b6b6b);
dc.DrawText(m_text, pt);
}
//int content_height = icon.GetBmpHeight() + textSize.y + m_padding;
/*int content_height = m_padding;
@@ -352,6 +354,18 @@ void FanSwitchButton::setFanValue(int val)
Refresh();
}
void FanSwitchButton::UseTextFan() { SetText(_L("Fan")); }
void FanSwitchButton::UseTextAirCondition() { SetText(_L("Air Condition")); }
void FanSwitchButton::SetText(const wxString &text)
{
if (m_text != text)
{
m_text = text;
Refresh();
}
}
void FanSwitchButton::mouseDown(wxMouseEvent& event)
{
event.Skip();

7
src/slic3r/GUI/Widgets/ImageSwitchButton.hpp
View File

@@ -64,6 +64,9 @@ public:
void Rescale();
void setFanValue(int val);
void UseTextFan();
void UseTextAirCondition();
private:
void messureSize();
void paintEvent(wxPaintEvent& evt);
@@ -74,6 +77,8 @@ private:
void mouseLeaveWindow(wxMouseEvent& event);
void sendButtonEvent();
void SetText(const wxString &text);
DECLARE_EVENT_TABLE()
private:
@@ -89,6 +94,8 @@ private:
int m_speed;
wxString labels[2];
wxString m_text;
StateColor text_color;
};