3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-30 20:21:12 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

ENH:optimize the display effect of white filaments

Browse source 
Change-Id: I690b521d641a91b7f50534ab86b5199f3dd84526
This commit is contained in:
tao wang 2023-04-12 16:33:50 +08:00 • committed by Lane.Wei
parent f49c151611
commit c8f1b7698e
1 changed files with 24 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/slic3r/GUI/Widgets/AMSControl.cpp
View file

@ -476,17 +476,35 @@ void AMSextruder::doRender(wxDC& dc)
if (m_vams_loading) { if (m_vams_loading) {
dc.SetPen(wxPen(m_current_colur, 6, wxSOLID)); dc.SetPen(wxPen(m_current_colur, 6, wxSOLID));
dc.DrawRoundedRectangle(-size.x / 2, size.y * 0.1, size.x, size.y, 4); dc.DrawRoundedRectangle(-size.x / 2, size.y * 0.1, size.x, size.y, 4);
if (m_current_colur == *wxWHITE && !wxGetApp().dark_mode()) {
dc.SetPen(wxPen(AMS_CONTROL_DEF_BLOCK_BK_COLOUR, 1, wxSOLID));
dc.DrawRoundedRectangle(-size.x / 2 - FromDIP(3), size.y * 0.1 + FromDIP(3), size.x, size.y, 3);
dc.DrawRoundedRectangle(-size.x / 2 + FromDIP(3), size.y * 0.1 - FromDIP(3), size.x, size.y, 5);
}
} }
if (m_ams_loading && !m_none_ams_mode) { if (m_ams_loading && !m_none_ams_mode) {
dc.SetPen(wxPen(m_current_colur, 6, wxSOLID)); dc.SetPen(wxPen(m_current_colur, 6, wxSOLID));
dc.DrawLine(size.x / 2, -1, size.x / 2, size.y * 0.6 - 1); dc.DrawLine(size.x / 2, -1, size.x / 2, size.y * 0.6 - 1);
if (m_current_colur == *wxWHITE && !wxGetApp().dark_mode()) {
dc.SetPen(wxPen(AMS_CONTROL_DEF_BLOCK_BK_COLOUR, 1, wxSOLID));
dc.DrawLine(size.x / 2 - FromDIP(4), -1, size.x / 2 - FromDIP(3), size.y * 0.6 - 1);
dc.DrawLine(size.x / 2 + FromDIP(3), -1, size.x / 2 + FromDIP(3), size.y * 0.6 - 1);
}
} }
} }
else { else {
if (m_ams_loading) { if (m_ams_loading) {
dc.SetPen(wxPen(m_current_colur, 6, wxSOLID)); dc.SetPen(wxPen(m_current_colur, 6, wxSOLID));
dc.DrawLine(size.x / 2, -1, size.x / 2, size.y * 0.6 - 1); dc.DrawLine(size.x / 2, -1, size.x / 2, size.y * 0.6 - 1);
if (m_current_colur == *wxWHITE && !wxGetApp().dark_mode()) {
dc.SetPen(wxPen(AMS_CONTROL_DEF_BLOCK_BK_COLOUR, 1, wxSOLID));
dc.DrawLine(size.x / 2 - FromDIP(4), -1, size.x / 2 - FromDIP(3), size.y * 0.6 - 1);
dc.DrawLine(size.x / 2 + FromDIP(3), -1, size.x / 2 + FromDIP(3), size.y * 0.6 - 1);
}
} }
} }
@ -563,8 +581,13 @@ void AMSVirtualRoad::doRender(wxDC& dc)
} }
dc.SetBrush(wxBrush(*wxTRANSPARENT_BRUSH)); dc.SetBrush(wxBrush(*wxTRANSPARENT_BRUSH));
dc.DrawRoundedRectangle(size.x / 2, -size.y / 1.1 + FromDIP(1), size.x, size.y, 4); dc.DrawRoundedRectangle(size.x / 2, -size.y / 1.1 + FromDIP(1), size.x, size.y, 4);
if (m_current_color == *wxWHITE && !wxGetApp().dark_mode()) {
dc.SetPen(wxPen(AMS_CONTROL_DEF_BLOCK_BK_COLOUR, 1, wxSOLID));
dc.DrawRoundedRectangle(size.x / 2 - FromDIP(3), -size.y / 1.1 + FromDIP(4), size.x, size.y, 5);
dc.DrawRoundedRectangle(size.x / 2 + FromDIP(3), -size.y / 1.1 - FromDIP(2), size.x, size.y, 3);
}
} }