mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: avoid the bug in wxControl::Ellipsize api 

exist a bug where the last bit of Ellipsize api in the wxwidgets is an out of bounds array with the '&' symbol.

Change-Id: Ie54f7958195815bd9b028f86284cc5da582cee8a
This commit is contained in:
zhou.xu 2023-08-03 17:26:54 +08:00 committed by Lane.Wei
parent 47db82ee1e
commit 7a3dcda2a2
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/slic3r/GUI/PartPlate.cpp
View File

@ -1778,6 +1778,18 @@ bool PartPlate::generate_plate_name_texture()
wxString cur_plate_name = from_u8(m_name); wxString cur_plate_name = from_u8(m_name);
wxGCDC dc; wxGCDC dc;
wxString limitTextWidth = wxControl::Ellipsize(cur_plate_name, dc, wxELLIPSIZE_END, bed_width); wxString limitTextWidth = wxControl::Ellipsize(cur_plate_name, dc, wxELLIPSIZE_END, bed_width);
if (limitTextWidth.size() ==4 && limitTextWidth.rfind("...") != std::string::npos && cur_plate_name.rfind('&') != std::string::npos) {
// Avoided a bug where the last bit of Ellipsize api in the wxwidgets is an out of bounds array with the '&' symbol
// wxwidgets version:3.2.2.1
for (auto it = cur_plate_name.rbegin(); it != cur_plate_name.rend(); ++it) {
if (*it == '&') {
cur_plate_name = cur_plate_name.RemoveLast();
} else {
break;
}
}
limitTextWidth = wxControl::Ellipsize(cur_plate_name, dc, wxELLIPSIZE_END, bed_width);
}
if (limitTextWidth.Length()==0) { if (limitTextWidth.Length()==0) {
return false; return false;
} }