From 03957c567ea0ffed58057f0fafe6f311e87f3a10 Mon Sep 17 00:00:00 2001 From: "xin.zhang" Date: Tue, 15 Apr 2025 16:29:20 +0800 Subject: [PATCH] FIX: add transparent painting for AMS lite jira: [STUDIO-11488] Change-Id: I1b180ad7389eb4d74c3686b0559ce26172f7b264 --- src/slic3r/GUI/Widgets/AMSItem.cpp | 9 +++++++++ src/slic3r/GUI/Widgets/AMSItem.hpp | 1 + 2 files changed, 10 insertions(+) diff --git a/src/slic3r/GUI/Widgets/AMSItem.cpp b/src/slic3r/GUI/Widgets/AMSItem.cpp index 1a17b3e90..f0ae116b0 100644 --- a/src/slic3r/GUI/Widgets/AMSItem.cpp +++ b/src/slic3r/GUI/Widgets/AMSItem.cpp @@ -842,6 +842,7 @@ void AMSLib::create(wxWindow *parent, wxWindowID id, const wxPoint &pos, const w m_bitmap_readonly_light = ScalableBitmap(this, "ams_readonly_light", 14); m_bitmap_transparent = ScalableBitmap(this, "transparent_ams_lib", 76); m_bitmap_transparent_def = ScalableBitmap(this, "transparent_ams_lib", 76); + m_bitmap_transparent_lite = ScalableBitmap(this, "transparent_ams_lib", 56); m_bitmap_extra_tray_left = ScalableBitmap(this, "extra_ams_tray_left", 72); m_bitmap_extra_tray_right = ScalableBitmap(this, "extra_ams_tray_right", 72); @@ -1239,6 +1240,12 @@ void AMSLib::render_lite_lib(wxDC& dc) if (tmp_lib_colour.Alpha() == 0) { temp_bitmap_third = m_bitmap_editable; temp_bitmap_brand = m_bitmap_readonly; + + if (m_ams_model == AMSModel::EXT_AMS) { + dc.DrawBitmap(m_bitmap_transparent_lite.bmp(), FromDIP(8), (size.y - libsize.y) / 2 + FromDIP(8)); + } else { + dc.DrawBitmap(m_bitmap_transparent_lite.bmp(), FromDIP(10), (size.y - libsize.y) / 2 + FromDIP(8)); + } } dc.SetPen(wxPen(*wxTRANSPARENT_PEN)); @@ -1638,6 +1645,8 @@ void AMSLib::msw_rescale() { //m_bitmap_transparent.msw_rescale(); m_bitmap_transparent_def.msw_rescale(); + m_bitmap_transparent_lite.msw_rescale(); + m_bitmap_editable = ScalableBitmap(this, "ams_editable", 14); m_bitmap_editable_light = ScalableBitmap(this, "ams_editable_light", 14); m_bitmap_readonly = ScalableBitmap(this, "ams_readonly", 14); diff --git a/src/slic3r/GUI/Widgets/AMSItem.hpp b/src/slic3r/GUI/Widgets/AMSItem.hpp index 94daf20fa..ff1a3f75f 100644 --- a/src/slic3r/GUI/Widgets/AMSItem.hpp +++ b/src/slic3r/GUI/Widgets/AMSItem.hpp @@ -476,6 +476,7 @@ protected: ScalableBitmap m_bitmap_readonly_light; ScalableBitmap m_bitmap_transparent; ScalableBitmap m_bitmap_transparent_def; + ScalableBitmap m_bitmap_transparent_lite; ScalableBitmap m_bitmap_extra_tray_left; ScalableBitmap m_bitmap_extra_tray_right;