From e6070fc6079eae11ccceaa69b0e6861575f766cb Mon Sep 17 00:00:00 2001 From: tao wang Date: Wed, 31 May 2023 09:25:00 +0800 Subject: [PATCH] ENH:optimize the style of transparent filaments Change-Id: I3b105cb69172c21e4ed10bda0d22d7620d09a0a4 --- src/slic3r/GUI/Widgets/AMSControl.cpp | 13 ++++++++++++- src/slic3r/GUI/Widgets/AMSControl.hpp | 4 +++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/slic3r/GUI/Widgets/AMSControl.cpp b/src/slic3r/GUI/Widgets/AMSControl.cpp index b72c46b55..a5340e748 100644 --- a/src/slic3r/GUI/Widgets/AMSControl.cpp +++ b/src/slic3r/GUI/Widgets/AMSControl.cpp @@ -643,7 +643,7 @@ void AMSLib::create(wxWindow *parent, wxWindowID id, const wxPoint &pos, const w m_bitmap_editable_light = ScalableBitmap(this, "ams_editable_light", 14); m_bitmap_readonly = ScalableBitmap(this, "ams_readonly", 14); m_bitmap_readonly_light = ScalableBitmap(this, "ams_readonly_light", 14); - m_bitmap_transparent = ScalableBitmap(this, "transparent_ams_lib", FromDIP(68)); + m_bitmap_transparent = ScalableBitmap(this, "transparent_ams_lib", 68); m_sizer_body->Add(0, 0, 1, wxEXPAND, 0); m_sizer_body->Add(m_sizer_edit, 0, wxALIGN_CENTER, 0); @@ -1022,6 +1022,11 @@ void AMSLib::UnSelected() bool AMSLib::Enable(bool enable) { return wxWindow::Enable(enable); } +void AMSLib::msw_rescale() +{ + m_bitmap_transparent.msw_rescale(); +} + /************************************************* Description:AMSRoad **************************************************/ @@ -1766,6 +1771,11 @@ void AmsCans::msw_rescale() Canrefreshs *refresh = m_can_refresh_list[i]; refresh->canrefresh->msw_rescale(); } + + for (auto i = 0; i < m_can_lib_list.GetCount(); i++) { + CanLibs* lib = m_can_lib_list[i]; + lib->canLib->msw_rescale(); + } } void AmsCans::show_sn_value(bool show) @@ -2508,6 +2518,7 @@ void AMSControl::msw_rescale() m_button_ams_setting->SetMinSize(wxSize(FromDIP(25), FromDIP(24))); m_button_guide->SetMinSize(wxSize(-1, FromDIP(24))); m_button_retry->SetMinSize(wxSize(-1, FromDIP(24))); + m_vams_lib->msw_rescale(); for (auto i = 0; i < m_ams_cans_list.GetCount(); i++) { AmsCansWindow *cans = m_ams_cans_list[i]; diff --git a/src/slic3r/GUI/Widgets/AMSControl.hpp b/src/slic3r/GUI/Widgets/AMSControl.hpp index 46f0db64a..fc65979f6 100644 --- a/src/slic3r/GUI/Widgets/AMSControl.hpp +++ b/src/slic3r/GUI/Widgets/AMSControl.hpp @@ -302,7 +302,9 @@ public: void show_kn_value(bool show) { m_show_kn = show; }; void support_cali(bool sup) { m_support_cali = sup; Refresh(); }; virtual bool Enable(bool enable = true); - void set_disable_mode(bool disable) { m_disable_mode = disable; } + void set_disable_mode(bool disable) { m_disable_mode = disable; } + void msw_rescale(); + protected: wxStaticBitmap *m_edit_bitmp = {nullptr};