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

use absl::StrCat for font filenames linux

Browse Source
This commit is contained in:
scawful
2024-05-28 19:31:56 -04:00
parent 1ff689605f
commit 3a3eac8ba3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -392,7 +392,7 @@ absl::Status Controller::LoadFontFamilies() const {
#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 = HOME + "/" + font_path; font_path = absl::StrCat(HOME, "/", font_path);
#endif #endif
if (!io.Fonts->AddFontFromFileTTF(font_path, font_size)) { if (!io.Fonts->AddFontFromFileTTF(font_path, font_size)) {
@@ -403,7 +403,7 @@ absl::Status Controller::LoadFontFamilies() const {
// 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;
#ifdef __linux__ #ifdef __linux__
icon_font_path = HOME + "/" + icon_font_path; 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(icon_font_path, ICON_FONT_SIZE, &icons_config,
icons_ranges); icons_ranges);
@@ -411,7 +411,7 @@ absl::Status Controller::LoadFontFamilies() const {
// Merge Japanese font // Merge Japanese font
const char *japanese_font_path = NOTO_SANS_JP; const char *japanese_font_path = NOTO_SANS_JP;
#ifdef __linux__ #ifdef __linux__
japanese_font_path = HOME + "/" + japanese_font_path; japanese_font_path = absl::StrCat(HOME, "/", japanese_font_path);
#endif #endif
io.Fonts->AddFontFromFileTTF(japanese_font_path, 18.0f, io.Fonts->AddFontFromFileTTF(japanese_font_path, 18.0f,
&japanese_font_config, &japanese_font_config,