From 5b2ccfb2eb63ced99b32fd9635cfe7c72445e98b Mon Sep 17 00:00:00 2001
From: "xin.zhang" <xin.zhang@bambulab.com>
Date: Tue, 31 Dec 2024 11:32:38 +0800
Subject: [PATCH] =?UTF-8?q?FIX=EF=BC=9Aupdate=20heating=20png=20for=20extr?=
 =?UTF-8?q?uder=20;=20remove=20useless=20label?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

jira: [STUDIO-9444] [STUDIO-9361]
Change-Id: Ic483efb235a8c11edf84f276fe6ba4c0dca43ffa
---
 src/slic3r/GUI/Widgets/StepCtrl.cpp  |  2 --
 src/slic3r/GUI/Widgets/TempInput.cpp | 28 +++++++++++++---------------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/slic3r/GUI/Widgets/StepCtrl.cpp b/src/slic3r/GUI/Widgets/StepCtrl.cpp
index c4dd6034d..f58c7707f 100644
--- a/src/slic3r/GUI/Widgets/StepCtrl.cpp
+++ b/src/slic3r/GUI/Widgets/StepCtrl.cpp
@@ -412,8 +412,6 @@ void FilamentStepIndicator::doRender(wxDC& dc)
 
     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);
     circleY += sz.y;
 
diff --git a/src/slic3r/GUI/Widgets/TempInput.cpp b/src/slic3r/GUI/Widgets/TempInput.cpp
index c88aae21b..a899959cc 100644
--- a/src/slic3r/GUI/Widgets/TempInput.cpp
+++ b/src/slic3r/GUI/Widgets/TempInput.cpp
@@ -414,20 +414,18 @@ void TempInput::render(wxDC &dc)
     if (normal_icon.bmp().IsOk()) szIcon = normal_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) {
-            szIcon = actice_icon.GetBmpSize();
-            pt.y = (size.y - szIcon.y) / 2;
-            dc.DrawBitmap(actice_icon.bmp(), pt);
-        }
-        else {
-            actice = false;
-        }
-        if (normal_icon.bmp().IsOk() && !actice) {
-            szIcon = normal_icon.GetBmpSize();
-            pt.y = (size.y - szIcon.y) / 2;
-            dc.DrawBitmap(normal_icon.bmp(), pt);
-        }
+    if (actice_icon.bmp().IsOk() && actice) {
+        szIcon = actice_icon.GetBmpSize();
+        pt.y = (size.y - szIcon.y) / 2;
+        dc.DrawBitmap(actice_icon.bmp(), pt);
+    }
+    else {
+        actice = false;
+    }
+    if (normal_icon.bmp().IsOk() && !actice) {
+        szIcon = normal_icon.GetBmpSize();
+        pt.y = (size.y - szIcon.y) / 2;
+        dc.DrawBitmap(normal_icon.bmp(), pt);
     }
 
     pt.x += szIcon.x + 9;
@@ -450,7 +448,7 @@ void TempInput::render(wxDC &dc)
         dc.DrawBitmap(right_icon.bmp(), pt);
 
         dc.SetFont(::Label::Body_12);
-        auto sepSize = dc.GetMultiLineTextExtent(wxString("L"));
+        auto sepSize = dc.GetMultiLineTextExtent(wxString("R"));
         dc.SetTextForeground(*wxWHITE);
         dc.SetTextBackground(*wxWHITE);
         dc.DrawText(wxString("R"), pt.x + (szIcon.x - sepSize.x) / 2, (size.y - sepSize.y) / 2);