GitHub-Proxy/BambuStudio
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/bambulab/BambuStudio.git synced 2025-09-28 23:03:13 +08:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

FIX: add transparent painting for AMS lite

Browse Source 
jira: [STUDIO-11488]
Change-Id: I1b180ad7389eb4d74c3686b0559ce26172f7b264
This commit is contained in:
xin.zhang 2025-04-15 16:29:20 +08:00 committed by lane.wei
parent 1480c97ffa
commit 03957c567e
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/slic3r/GUI/Widgets/AMSItem.cpp
View File

@ -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_readonly_light = ScalableBitmap(this, "ams_readonly_light", 14);
m_bitmap_transparent = ScalableBitmap(this, "transparent_ams_lib", 76); m_bitmap_transparent = ScalableBitmap(this, "transparent_ams_lib", 76);
m_bitmap_transparent_def = 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_left = ScalableBitmap(this, "extra_ams_tray_left", 72);
m_bitmap_extra_tray_right = ScalableBitmap(this, "extra_ams_tray_right", 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) { if (tmp_lib_colour.Alpha() == 0) {
temp_bitmap_third = m_bitmap_editable; temp_bitmap_third = m_bitmap_editable;
temp_bitmap_brand = m_bitmap_readonly; 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)); dc.SetPen(wxPen(*wxTRANSPARENT_PEN));
@ -1638,6 +1645,8 @@ void AMSLib::msw_rescale()
{ {
//m_bitmap_transparent.msw_rescale(); //m_bitmap_transparent.msw_rescale();
m_bitmap_transparent_def.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 = ScalableBitmap(this, "ams_editable", 14);
m_bitmap_editable_light = ScalableBitmap(this, "ams_editable_light", 14); m_bitmap_editable_light = ScalableBitmap(this, "ams_editable_light", 14);
m_bitmap_readonly = ScalableBitmap(this, "ams_readonly", 14); m_bitmap_readonly = ScalableBitmap(this, "ams_readonly", 14);

1
src/slic3r/GUI/Widgets/AMSItem.hpp
View File

@ -476,6 +476,7 @@ protected:
ScalableBitmap m_bitmap_readonly_light; ScalableBitmap m_bitmap_readonly_light;
ScalableBitmap m_bitmap_transparent; ScalableBitmap m_bitmap_transparent;
ScalableBitmap m_bitmap_transparent_def; ScalableBitmap m_bitmap_transparent_def;
ScalableBitmap m_bitmap_transparent_lite;
ScalableBitmap m_bitmap_extra_tray_left; ScalableBitmap m_bitmap_extra_tray_left;
ScalableBitmap m_bitmap_extra_tray_right; ScalableBitmap m_bitmap_extra_tray_right;