mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX：update heating png for extruder ; remove useless label 

jira: [STUDIO-9444] [STUDIO-9361]
Change-Id: Ic483efb235a8c11edf84f276fe6ba4c0dca43ffa
This commit is contained in:
xin.zhang 2024-12-31 11:32:38 +08:00 committed by lane.wei
parent 48ddd62c4f
commit 5b2ccfb2eb
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/slic3r/GUI/Widgets/StepCtrl.cpp
View File

@ -412,8 +412,6 @@ void FilamentStepIndicator::doRender(wxDC& dc)
dc.SetFont(::Label::Body_13); dc.SetFont(::Label::Body_13);
dc.DrawText(m_slot_information, circleX + sz.GetWidth() + FromDIP(5), circleY + FromDIP(3));
dc.DrawBitmap(bmp_extruder, FromDIP(250), circleY); dc.DrawBitmap(bmp_extruder, FromDIP(250), circleY);
circleY += sz.y; circleY += sz.y;

4
src/slic3r/GUI/Widgets/TempInput.cpp
View File

@ -414,7 +414,6 @@ void TempInput::render(wxDC &dc)
if (normal_icon.bmp().IsOk()) szIcon = normal_icon.GetBmpSize(); if (normal_icon.bmp().IsOk()) szIcon = normal_icon.GetBmpSize();
else if (actice_icon.bmp().IsOk()) szIcon = actice_icon.GetBmpSize(); else if (actice_icon.bmp().IsOk()) szIcon = actice_icon.GetBmpSize();
if (m_input_type != TEMP_OF_DEPUTY_NOZZLE_TYPE) {
if (actice_icon.bmp().IsOk() && actice) { if (actice_icon.bmp().IsOk() && actice) {
szIcon = actice_icon.GetBmpSize(); szIcon = actice_icon.GetBmpSize();
pt.y = (size.y - szIcon.y) / 2; pt.y = (size.y - szIcon.y) / 2;
@ -428,7 +427,6 @@ void TempInput::render(wxDC &dc)
pt.y = (size.y - szIcon.y) / 2; pt.y = (size.y - szIcon.y) / 2;
dc.DrawBitmap(normal_icon.bmp(), pt); dc.DrawBitmap(normal_icon.bmp(), pt);
} }
}
pt.x += szIcon.x + 9; pt.x += szIcon.x + 9;
if (left_icon.bmp().IsOk() && m_input_type == TEMP_OF_DEPUTY_NOZZLE_TYPE){ if (left_icon.bmp().IsOk() && m_input_type == TEMP_OF_DEPUTY_NOZZLE_TYPE){
@ -450,7 +448,7 @@ void TempInput::render(wxDC &dc)
dc.DrawBitmap(right_icon.bmp(), pt); dc.DrawBitmap(right_icon.bmp(), pt);
dc.SetFont(::Label::Body_12); dc.SetFont(::Label::Body_12);
auto sepSize = dc.GetMultiLineTextExtent(wxString("L")); auto sepSize = dc.GetMultiLineTextExtent(wxString("R"));
dc.SetTextForeground(*wxWHITE); dc.SetTextForeground(*wxWHITE);
dc.SetTextBackground(*wxWHITE); dc.SetTextBackground(*wxWHITE);
dc.DrawText(wxString("R"), pt.x + (szIcon.x - sepSize.x) / 2, (size.y - sepSize.y) / 2); dc.DrawText(wxString("R"), pt.x + (szIcon.x - sepSize.x) / 2, (size.y - sepSize.y) / 2);