otomatalabs/furnace
8
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix about screen

Browse source
This commit is contained in:
tildearrow 2024-06-17 23:53:00 -05:00
parent 7a72990395
commit 9aed6fc47c
19 changed files with 39 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/gui/gui.cpp
View file

@ -7081,10 +7081,19 @@ bool FurnaceGUI::init() {
next=0;
}
}
if (next!=0) {
localeExtraRanges.push_back(next);
}
localeExtraRanges.push_back(0);
}
}
}
if (!localeExtraRanges.empty()) {
logV("locale extra ranges:");
for (ImWchar i: localeExtraRanges) {
logV("%x",i);
}
}
loadUserPresets(true);

1
src/gui/gui.h
View file

@ -1689,6 +1689,7 @@ class FurnaceGUI {
ImFont* bigFont;
ImFont* headFont;
ImWchar* fontRange;
ImWchar* fontRangeB;
ImVec4 uiColors[GUI_COLOR_MAX];
ImVec4 volColors[128];
ImU32 pitchGrad[256];

26
src/gui/settings.cpp
View file

@ -6838,17 +6838,35 @@ void FurnaceGUI::applyUISettings(bool updateFonts) {
// ไทย
static const ImWchar bigFontRange[]={0x20,0xFF,0x39b,0x39b,0x10d,0x10d,0x420,0x420,0x423,0x423,0x430,0x430,0x438,0x438,0x439,0x439,0x43a,0x43a,0x43d,0x43d,0x440,0x440,0x441,0x441,0x443,0x443,0x44c,0x44c,0x457,0x457,0x540,0x540,0x561,0x561,0x565,0x565,0x575,0x575,0x576,0x576,0x580,0x580,0xe17,0xe17,0xe22,0xe22,0xe44,0xe44,0x65e5,0x65e5,0x672c,0x672c,0x8a9e,0x8a9e,0xad6d,0xad6d,0xc5b4,0xc5b4,0xd55c,0xd55c,0};
if ((bigFont=addFontZlib(font_plexSans_compressed_data,font_plexSans_compressed_size,MAX(1,40*dpiScale),&fontConfB,bigFontRange))==NULL) {
ImFontGlyphRangesBuilder bigFontRangeB;
ImVector<ImWchar> outRangeB;
bigFontRangeB.AddRanges(bigFontRange);
if (!localeExtraRanges.empty()) {
bigFontRangeB.AddRanges(localeExtraRanges.data());
}
// I'm terribly sorry
bigFontRangeB.UsedChars[0x80>>5]=0;
bigFontRangeB.BuildRanges(&outRangeB);
if (fontRangeB!=NULL) delete[] fontRangeB;
fontRangeB=new ImWchar[outRangeB.size()];
index=0;
for (ImWchar& i: outRangeB) {
fontRangeB[index++]=i;
}
if ((bigFont=addFontZlib(font_plexSans_compressed_data,font_plexSans_compressed_size,MAX(1,40*dpiScale),&fontConfB,fontRangeB))==NULL) {
logE("could not load big UI font!");
}
fontConfB.MergeMode=true;
if ((bigFont=addFontZlib(font_plexSansJP_compressed_data,font_plexSansJP_compressed_size,MAX(1,40*dpiScale),&fontConfB,bigFontRange))==NULL) {
if ((bigFont=addFontZlib(font_plexSansJP_compressed_data,font_plexSansJP_compressed_size,MAX(1,40*dpiScale),&fontConfB,fontRangeB))==NULL) {
logE("could not load big UI font (japanese)!");
}
if ((bigFont=addFontZlib(font_plexSansKR_compressed_data,font_plexSansKR_compressed_size,MAX(1,40*dpiScale),&fontConfB,bigFontRange))==NULL) {
if ((bigFont=addFontZlib(font_plexSansKR_compressed_data,font_plexSansKR_compressed_size,MAX(1,40*dpiScale),&fontConfB,fontRangeB))==NULL) {
logE("could not load big UI font (korean)!");
}
if ((bigFont=addFontZlib(font_unifont_compressed_data,font_unifont_compressed_size,MAX(1,40*dpiScale),&fontConfB,bigFontRange))==NULL) {
if ((bigFont=addFontZlib(font_unifont_compressed_data,font_unifont_compressed_size,MAX(1,40*dpiScale),&fontConfB,fontRangeB))==NULL) {
logE("could not load big UI font (fallback)!");
}