scawful/yaze
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update font loading for macOS bundle resources

Browse Source
This commit is contained in:
scawful
2024-09-07 09:59:20 -04:00
parent b4ffca2863
commit 4e47cd3c76
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/app/core/controller.cc
View File

@@ -461,10 +461,11 @@ absl::Status Controller::LoadFontFamilies() const {
const std::string kBundlePath = GetBundleResourcePath(); const std::string kBundlePath = GetBundleResourcePath();
actual_font_path = kBundlePath + font_path; actual_font_path = kBundlePath + font_path;
#else #else
actual_font_path = std::filesystem::absolute(font_path).string(); actual_font_path = absl::StrCat(GetBundleResourcePath(),
"Contents/Resources/font/", font_path);
#endif #endif
#else #else
actual_font_path = font_path; actual_font_path = std::filesystem::absolute(font_path).string();
#endif #endif
if (!io.Fonts->AddFontFromFileTTF(actual_font_path.data(), font_size)) { if (!io.Fonts->AddFontFromFileTTF(actual_font_path.data(), font_size)) {
@@ -480,9 +481,12 @@ absl::Status Controller::LoadFontFamilies() const {
const std::string kIconBundlePath = GetBundleResourcePath(); const std::string kIconBundlePath = GetBundleResourcePath();
actual_icon_font_path = kIconBundlePath + "MaterialIcons-Regular.ttf"; actual_icon_font_path = kIconBundlePath + "MaterialIcons-Regular.ttf";
#else #else
actual_icon_font_path = std::filesystem::absolute(icon_font_path).string(); actual_icon_font_path =
absl::StrCat(GetBundleResourcePath(),
"Contents/Resources/font/MaterialIcons-Regular.ttf");
#endif #endif
#else #else
actual_icon_font_path = std::filesystem::absolute(icon_font_path).string();
#endif #endif
io.Fonts->AddFontFromFileTTF(actual_icon_font_path.data(), ICON_FONT_SIZE, io.Fonts->AddFontFromFileTTF(actual_icon_font_path.data(), ICON_FONT_SIZE,
&icons_config, icons_ranges); &icons_config, icons_ranges);
@@ -496,9 +500,12 @@ absl::Status Controller::LoadFontFamilies() const {
actual_japanese_font_path = kJapaneseBundlePath + japanese_font_path; actual_japanese_font_path = kJapaneseBundlePath + japanese_font_path;
#else #else
actual_japanese_font_path = actual_japanese_font_path =
std::filesystem::absolute(japanese_font_path).string(); absl::StrCat(GetBundleResourcePath(), "Contents/Resources/font/",
japanese_font_path);
#endif #endif
#else #else
actual_japanese_font_path =
std::filesystem::absolute(japanese_font_path).string();
#endif #endif
io.Fonts->AddFontFromFileTTF(actual_japanese_font_path.data(), 18.0f, io.Fonts->AddFontFromFileTTF(actual_japanese_font_path.data(), 18.0f,
&japanese_font_config, &japanese_font_config,