GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-07-31 17:11:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix human readable name of font for non UTF8 fonts

Browse Source
This commit is contained in:
Filip Sykala - NTB T15p 2024-08-14 12:57:22 +02:00 committed by Lukas Matena
parent 79dc95d3e8
commit de43802ca8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/slic3r/Utils/WxFontUtils.cpp
View File

@ -166,12 +166,12 @@ std::string WxFontUtils::get_human_readable_name(const wxFont &font)
if (!font.IsOk()) return "Font is NOT ok."; if (!font.IsOk()) return "Font is NOT ok.";
// Face name is optional in wxFont // Face name is optional in wxFont
if (!font.GetFaceName().empty()) { if (!font.GetFaceName().empty()) {
return std::string(font.GetFaceName().c_str()); return std::string(font.GetFaceName().ToUTF8().data());
} else { } else {
return std::string((font.GetFamilyString() + " " + return std::string((font.GetFamilyString() + " " +
font.GetStyleString() + " " + font.GetStyleString() + " " +
font.GetWeightString()) font.GetWeightString())
.c_str()); .ToUTF8().data());
} }
} }
@ -193,7 +193,7 @@ wxFont WxFontUtils::load_wxFont(const std::string &font_descriptor)
{ {
BOOST_LOG_TRIVIAL(trace) << "'" << font_descriptor << "'font descriptor string param of load_wxFont()"; BOOST_LOG_TRIVIAL(trace) << "'" << font_descriptor << "'font descriptor string param of load_wxFont()";
wxString font_descriptor_wx(font_descriptor); wxString font_descriptor_wx(font_descriptor);
BOOST_LOG_TRIVIAL(trace) << "'" << font_descriptor_wx.c_str() << "' wx string descriptor"; BOOST_LOG_TRIVIAL(trace) << "'" << font_descriptor_wx.ToUTF8().data() << "' wx string descriptor";
wxFont wx_font(font_descriptor_wx); wxFont wx_font(font_descriptor_wx);
BOOST_LOG_TRIVIAL(trace) << "loaded font is '" << get_human_readable_name(wx_font) << "'."; BOOST_LOG_TRIVIAL(trace) << "loaded font is '" << get_human_readable_name(wx_font) << "'.";
return wx_font; return wx_font;