3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allowe font which are not in allow list

Browse Source
This commit is contained in:
Filip Sykala - NTB T15p 2023-01-31 12:07:57 +01:00
parent 3d9522fcd1
commit 5ded68cab2
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
View File

@ -1109,7 +1109,6 @@ bool GLGizmoEmboss::set_volume(ModelVolume *volume)
if (face_name_opt.has_value()) { if (face_name_opt.has_value()) {
face_name = wxString(face_name_opt->c_str()); face_name = wxString(face_name_opt->c_str());
//* SWITCH for search in OS fonts
// search in enumerated fonts // search in enumerated fonts
// refresh list of installed font in the OS. // refresh list of installed font in the OS.
init_face_names(); init_face_names();
@ -1118,12 +1117,19 @@ bool GLGizmoEmboss::set_volume(ModelVolume *volume)
const std::vector<FaceName> &faces = m_face_names.faces; const std::vector<FaceName> &faces = m_face_names.faces;
auto it = std::lower_bound(faces.begin(), faces.end(), face_name, cmp); auto it = std::lower_bound(faces.begin(), faces.end(), face_name, cmp);
is_font_installed = it != faces.end() && it->wx_name == face_name; is_font_installed = it != faces.end() && it->wx_name == face_name;
/*/
// test it by Wx if (!is_font_installed) {
wxFontEnumerator::InvalidateCache(); // check if wx allowed to set it up - another encoding of name
wxFont wx_font_; // temporary structure wxFontEnumerator::InvalidateCache();
is_font_installed = wx_font_.SetFaceName(face_name); wxFont wx_font_; // temporary structure
// */ if (wx_font_.SetFaceName(face_name) &&
WxFontUtils::create_font_file(wx_font_) != nullptr // can load TTF file?
) {
is_font_installed = true;
// QUESTION: add this name to allowed faces?
// Could create twin of font face
}
}
} }
wxFont wx_font; wxFont wx_font;