diff --git a/src/slic3r/GUI/AmsMappingPopup.hpp b/src/slic3r/GUI/AmsMappingPopup.hpp index 2d0fa41f0..10a75040f 100644 --- a/src/slic3r/GUI/AmsMappingPopup.hpp +++ b/src/slic3r/GUI/AmsMappingPopup.hpp @@ -289,7 +289,7 @@ public: void doRender(wxDC& dc); public: - int current_humidity_level; + int current_humidity_level = 0; ScalableBitmap close_img; wxStaticBitmap* curr_humidity_img; diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp index 522fa028e..db502c2a7 100644 --- a/src/slic3r/GUI/StatusPanel.cpp +++ b/src/slic3r/GUI/StatusPanel.cpp @@ -4940,6 +4940,15 @@ void StatusPanel::msw_rescale() m_tempCtrl_chamber->SetMinSize(size); m_tempCtrl_chamber->Rescale(); + for(int i = 0; i < m_extruder_book->GetPageCount(); i++) + { + ExtruderImage* ext_img = dynamic_cast (m_extruder_book->GetPage(i)); + if (ext_img) + { + ext_img->msw_rescale(); + } + } + m_bitmap_speed.msw_rescale(); m_bitmap_speed_active.msw_rescale(); diff --git a/src/slic3r/GUI/Widgets/AMSItem.cpp b/src/slic3r/GUI/Widgets/AMSItem.cpp index bd44f7ec8..c7d6b89fd 100644 --- a/src/slic3r/GUI/Widgets/AMSItem.cpp +++ b/src/slic3r/GUI/Widgets/AMSItem.cpp @@ -2761,9 +2761,9 @@ void AMSHumidity::doRender(wxDC& dc) dc.DrawText(hum_percentage, pot); pot.x += (tsize.x + FromDIP(5)); - pot.y += (tsize.y / 2 - FromDIP(4)); - tsize = dc.GetMultiLineTextExtent(_L("%")); dc.SetFont(Label::Body_12); + tsize = dc.GetMultiLineTextExtent(_L("%")); + pot.y += (tsize.y / 2 - FromDIP(4)); dc.DrawText(_L("%"), pot); //vertical line @@ -2776,7 +2776,7 @@ void AMSHumidity::doRender(wxDC& dc) //sun image /*pot.x = FromDIP(size.x * 0.69); pot.y = FromDIP((size.y - ams_sun_img.GetBmpHeight()) / 2);*/ - pot.x = pot.x + FromDIP(4); + pot.x = pot.x + FromDIP(ams_sun_img.GetBmpWidth() / 2); pot.y = FromDIP((size.y - ams_sun_img.GetBmpHeight()) / 2); dc.SetPen(wxPen(*wxTRANSPARENT_PEN)); dc.DrawBitmap(ams_sun_img.bmp(), pot);