GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-15 03:55:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix macro

Browse Source
This commit is contained in:
Filip Sykala 2021-10-13 12:09:59 +02:00
parent 2ed08e68c3
commit 4a406e27d4
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1085,15 +1085,6 @@ std::optional<Emboss::Font> WxFontUtils::load_font(const wxFont &font)
if (!font.IsOk()) return {}; if (!font.IsOk()) return {};
#ifdef _WIN32 #ifdef _WIN32
return Emboss::load_font(font.GetHFONT()); return Emboss::load_font(font.GetHFONT());
#elif FontConfigExist
static FontConfigHelp help;
std::string font_path = help.get_font_path(font);
if (font_path.empty()) return {};
return Emboss::load_font(font_path.c_str());
// HERE is place to add implementation for linux to
// convert from wxFont to filePath(as MacOS) or fontData pointer(as WinOs)
return {};
#elif __APPLE__ #elif __APPLE__
// use file path // use file path
const wxNativeFontInfo *info = font.GetNativeFontInfo(); const wxNativeFontInfo *info = font.GetNativeFontInfo();
@ -1109,6 +1100,16 @@ std::optional<Emboss::Font> WxFontUtils::load_font(const wxFont &font)
if (file_path.empty() || file_path.size() <= start) return {}; if (file_path.empty() || file_path.size() <= start) return {};
file_path = file_path.substr(start, file_path.size()-start); file_path = file_path.substr(start, file_path.size()-start);
return Emboss::load_font(file_path.c_str()); return Emboss::load_font(file_path.c_str());
#elif defined(FontConfigExist)
static FontConfigHelp help;
std::string font_path = help.get_font_path(font);
if (font_path.empty()) return {};
return Emboss::load_font(font_path.c_str());
#else
// HERE is place to add implementation for another platform
// to convert wxFont to font data as windows or font file path as linux
// Do not forget to allow macro USE_FONT_DIALOG
return {};
#endif #endif
} }