mirror of
https://github.com/tildearrow/furnace.git
synced 2024-11-27 06:53:01 +00:00
and one more fix
This commit is contained in:
parent
fcba244c84
commit
eb9bd913e2
1 changed files with 3 additions and 3 deletions
|
@ -4068,7 +4068,7 @@ void FurnaceGUI::applyUISettings(bool updateFonts) {
|
||||||
if ((headFont=ImGui::GetIO().Fonts->AddFontFromFileTTF(settings.headFontPath.c_str(),MAX(1,e->getConfInt("headFontSize",27)*dpiScale),NULL,upTo800))==NULL) {
|
if ((headFont=ImGui::GetIO().Fonts->AddFontFromFileTTF(settings.headFontPath.c_str(),MAX(1,e->getConfInt("headFontSize",27)*dpiScale),NULL,upTo800))==NULL) {
|
||||||
logW("could not load header font! reverting to default font");
|
logW("could not load header font! reverting to default font");
|
||||||
settings.headFont=0;
|
settings.headFont=0;
|
||||||
if ((headFont=ImGui::GetIO().Fonts->AddFontFromMemoryCompressedTTF(builtinFontM[settings.headFont],builtinFontMLen[settings.headFont],MAX(1,e->getConfInt("headFontSize",27)*dpiScale),NULL,upTo800))==NULL) {
|
if ((headFont=ImGui::GetIO().Fonts->AddFontFromMemoryCompressedTTF(builtinFont[settings.headFont],builtinFontLen[settings.headFont],MAX(1,e->getConfInt("headFontSize",27)*dpiScale),NULL,upTo800))==NULL) {
|
||||||
logE("could not load header font! falling back to IBM Plex Sans.");
|
logE("could not load header font! falling back to IBM Plex Sans.");
|
||||||
headFont=ImGui::GetIO().Fonts->AddFontDefault();
|
headFont=ImGui::GetIO().Fonts->AddFontDefault();
|
||||||
}
|
}
|
||||||
|
@ -4079,7 +4079,7 @@ void FurnaceGUI::applyUISettings(bool updateFonts) {
|
||||||
if ((headFont=ImGui::GetIO().Fonts->AddFontFromFileTTF(SYSTEM_HEAD_FONT_PATH_3,MAX(1,e->getConfInt("headFontSize",27)*dpiScale),NULL,upTo800))==NULL) {
|
if ((headFont=ImGui::GetIO().Fonts->AddFontFromFileTTF(SYSTEM_HEAD_FONT_PATH_3,MAX(1,e->getConfInt("headFontSize",27)*dpiScale),NULL,upTo800))==NULL) {
|
||||||
logW("could not load header font! reverting to default font");
|
logW("could not load header font! reverting to default font");
|
||||||
settings.headFont=0;
|
settings.headFont=0;
|
||||||
if ((headFont=ImGui::GetIO().Fonts->AddFontFromMemoryCompressedTTF(builtinFontM[settings.headFont],builtinFontMLen[settings.headFont],MAX(1,e->getConfInt("headFontSize",27)*dpiScale),NULL,upTo800))==NULL) {
|
if ((headFont=ImGui::GetIO().Fonts->AddFontFromMemoryCompressedTTF(builtinFont[settings.headFont],builtinFontLen[settings.headFont],MAX(1,e->getConfInt("headFontSize",27)*dpiScale),NULL,upTo800))==NULL) {
|
||||||
logE("could not load header font! falling back to IBM Plex Sans.");
|
logE("could not load header font! falling back to IBM Plex Sans.");
|
||||||
headFont=ImGui::GetIO().Fonts->AddFontDefault();
|
headFont=ImGui::GetIO().Fonts->AddFontDefault();
|
||||||
}
|
}
|
||||||
|
@ -4087,7 +4087,7 @@ void FurnaceGUI::applyUISettings(bool updateFonts) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if ((headFont=ImGui::GetIO().Fonts->AddFontFromMemoryCompressedTTF(builtinFontM[settings.headFont],builtinFontMLen[settings.headFont],MAX(1,e->getConfInt("headFontSize",27)*dpiScale),NULL,upTo800))==NULL) {
|
if ((headFont=ImGui::GetIO().Fonts->AddFontFromMemoryCompressedTTF(builtinFont[settings.headFont],builtinFontLen[settings.headFont],MAX(1,e->getConfInt("headFontSize",27)*dpiScale),NULL,upTo800))==NULL) {
|
||||||
logE("could not load header font!");
|
logE("could not load header font!");
|
||||||
headFont=ImGui::GetIO().Fonts->AddFontDefault();
|
headFont=ImGui::GetIO().Fonts->AddFontDefault();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue