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

update font loading string shit

Browse Source
This commit is contained in:
scawful
2024-05-28 19:50:35 -04:00
parent ab8846555c
commit c58131ddd7
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -389,31 +389,33 @@ absl::Status Controller::LoadFontFamilies() const {
for (const auto &font_path : font_paths) { for (const auto &font_path : font_paths) {
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;
std::string actual_font_path = font_path;
#ifdef __linux__ #ifdef __linux__
std::string const HOME = std::getenv("HOME") ? std::getenv("HOME") : "."; std::string const HOME = std::getenv("HOME") ? std::getenv("HOME") : ".";
font_path = absl::StrCat(HOME, "/", font_path); actual_font_path = absl::StrCat(HOME, "/", font_path);
#endif #endif
if (!io.Fonts->AddFontFromFileTTF(font_path, font_size)) { if (!io.Fonts->AddFontFromFileTTF(actual_font_path.data(), 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", actual_font_path));
} }
// Merge icon set // Merge icon set
const char *icon_font_path = FONT_ICON_FILE_NAME_MD; const char *icon_font_path = FONT_ICON_FILE_NAME_MD;
std::string actual_icon_font_path = icon_font_path;
#ifdef __linux__ #ifdef __linux__
icon_font_path = absl::StrCat(HOME, "/", icon_font_path); actual_icon_font_path = absl::StrCat(HOME, "/", icon_font_path);
#endif #endif
io.Fonts->AddFontFromFileTTF(icon_font_path, ICON_FONT_SIZE, &icons_config, io.Fonts->AddFontFromFileTTF(actual_icon_font_path.data(), ICON_FONT_SIZE,
icons_ranges); &icons_config, icons_ranges);
// Merge Japanese font // Merge Japanese font
const char *japanese_font_path = NOTO_SANS_JP; const char *japanese_font_path = NOTO_SANS_JP;
std::string actual_japanese_font_path = japanese_font_path;
#ifdef __linux__ #ifdef __linux__
japanese_font_path = absl::StrCat(HOME, "/", japanese_font_path); actual_japanese_font_path = absl::StrCat(HOME, "/", japanese_font_path);
#endif #endif
io.Fonts->AddFontFromFileTTF(japanese_font_path, 18.0f, io.Fonts->AddFontFromFileTTF(actual_japanese_font_path.data(), 18.0f,
&japanese_font_config, &japanese_font_config,
io.Fonts->GetGlyphRangesJapanese()); io.Fonts->GetGlyphRangesJapanese());
} }