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

add linux home env var to font path

Browse Source
This commit is contained in:
scawful
2024-05-28 19:24:41 -04:00
parent 6e79d4d59d
commit d7f94c5d2a
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -390,17 +390,31 @@ absl::Status Controller::LoadFontFamilies() const {
float font_size = float font_size =
(font_path == DROID_SANS) ? FONT_SIZE_DROID_SANS : FONT_SIZE_DEFAULT; (font_path == DROID_SANS) ? FONT_SIZE_DROID_SANS : FONT_SIZE_DEFAULT;
#ifdef __linux__
std::string const HOME = std::getenv("HOME") ? std::getenv("HOME") : ".";
font_path = HOME + "/" + font_path;
#endif
if (!io.Fonts->AddFontFromFileTTF(font_path, font_size)) { if (!io.Fonts->AddFontFromFileTTF(font_path, font_size)) {
return absl::InternalError( return absl::InternalError(
absl::StrFormat("Failed to load font from %s", font_path)); absl::StrFormat("Failed to load font from %s", font_path));
} }
// Merge icon set // Merge icon set
io.Fonts->AddFontFromFileTTF(FONT_ICON_FILE_NAME_MD, ICON_FONT_SIZE, const char *icon_font_path = FONT_ICON_FILE_NAME_MD;
&icons_config, icons_ranges); #ifdef __linux__
icon_font_path = HOME + "/" + icon_font_path;
#endif
io.Fonts->AddFontFromFileTTF(icon_font_path, ICON_FONT_SIZE, &icons_config,
icons_ranges);
// Merge Japanese font // Merge Japanese font
io.Fonts->AddFontFromFileTTF(NOTO_SANS_JP, 18.0f, &japanese_font_config, const char *japanese_font_path = NOTO_SANS_JP;
#ifdef __linux__
japanese_font_path = HOME + "/" + japanese_font_path;
#endif
io.Fonts->AddFontFromFileTTF(japanese_font_path, 18.0f,
&japanese_font_config,
io.Fonts->GetGlyphRangesJapanese()); io.Fonts->GetGlyphRangesJapanese());
} }