DarkStore-3DS/Universal-Core
1
0
Fork 0
mirror of https://github.com/DarkStore-3DS/Universal-Core.git synced 2026-07-02 16:59:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove font scale workarounds

Browse Source 
Fixed by recent versions of Citro2D
This commit is contained in:
Pk11
2022-03-04 21:23:44 -06:00
parent 4e141e6452
commit 4a62e87dc8
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gui.cpp
-11
View File
@@ -43,7 +43,6 @@ bool fadeout = false, fadein = false, fadeout2 = false, fadein2 = false;
int fadealpha = 0; int fadealpha = 0;
int fadecolor = 0; int fadecolor = 0;
CFG_Region loadedSystemFont = (CFG_Region)-1; CFG_Region loadedSystemFont = (CFG_Region)-1;
float fontScaleFix = 1.0f;
/* /*
Clear the Text Buffer. Clear the Text Buffer.
@@ -90,7 +89,6 @@ Result Gui::init(CFG_Region fontRegion) {
/* Load Textbuffer. */ /* Load Textbuffer. */
TextBuf = C2D_TextBufNew(4096); TextBuf = C2D_TextBufNew(4096);
fontScaleFix = C2D_FontGetInfo(nullptr)->tglp->cellHeight / 30.0f;
loadSystemFont(fontRegion); loadSystemFont(fontRegion);
return 0; return 0;
} }
@@ -217,20 +215,11 @@ void Gui::DrawString(float x, float y, float size, u32 color, const std::string
C2D_TextOptimize(&c2d_text); C2D_TextOptimize(&c2d_text);
// Fix Citro2D messing up font scales on Chinese / Taiwanese / Korean consoles
size *= fontScaleFix;
if(!fnt) { if(!fnt) {
switch(loadedSystemFont) { switch(loadedSystemFont) {
case CFG_REGION_CHN: case CFG_REGION_CHN:
size *= 1.1f;
y += 3.0f * size;
break;
case CFG_REGION_KOR: case CFG_REGION_KOR:
y += 3.0f * size;
break;
case CFG_REGION_TWN: case CFG_REGION_TWN:
size *= 1.4f;
y += 3.0f * size; y += 3.0f * size;
break; break;
default: default: