steam-frame/Toastconcern--FrameStudio
1
0 Fork 0
mirror of https://github.com/Toastconcern/FrameStudio.git synced 2026-10-28 20:03:07 +01:00
Code Issues Packages Projects Releases 3 Wiki Activity

Environments panel: load Windows fonts too, so its text shows on a PC

Browse Source 
The panel's fonts were loaded only from the Frame's Linux paths (/usr/share/fonts), so on a Windows PC none loaded
and almost no text drew. Try Windows' own Segoe UI and Arial after the Frame's Noto/DejaVu, so each weight has a real
font on either platform. Verified by rendering the panel headless (--render): all text is back.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
ToastconcernandClaude Opus 4.8 committed 2026-10-21 20:03:05 -05:00
1 parent aea212c878
commit 996c447a55
1 file changed
+22 -10
Download Patch File Download Diff File Expand all files Collapse all files
src/switcher.cpp
+22 -10
View File
@@ -546,6 +546,10 @@ struct Font {
for (const char* p : paths) if (load(p, px)) return true;
return false;
}
bool load(const std::vector<std::string>& paths, float px) {
for (const std::string& p : paths) if (load(p.c_str(), px)) return true;
return false;
}
const Glyph& glyph(int c) const {
auto it = glyphs.find(c);
if (it != glyphs.end()) return it->second;
@@ -1293,16 +1297,24 @@ struct Panel {
// ── Actions ──
void loadFonts() {
const char *bold = "/usr/share/fonts/noto/NotoSans-Bold.ttf", *semi = "/usr/share/fonts/noto/NotoSans-SemiBold.ttf",
*medium = "/usr/share/fonts/noto/NotoSans-Medium.ttf", *regular = "/usr/share/fonts/noto/NotoSans-Regular.ttf",
*dejaB = "/usr/share/fonts/TTF/DejaVuSans-Bold.ttf", *deja = "/usr/share/fonts/TTF/DejaVuSans.ttf";
title.load({bold, dejaB, deja}, 44);
head.load({bold, semi, dejaB, deja}, 30);
body.load({semi, medium, bold, deja}, 26);
label.load({semi, medium, bold, deja}, 22);
small.load({regular, deja}, 20);
tiny.load({bold, semi, dejaB, deja}, 17);
glyphFont.load({bold, dejaB, deja}, 96);
// The Frame's fonts (SteamOS) first, then Windows' own (Segoe UI, Arial) so the panel has real text on a PC —
// without them nothing drew. Each weight tries its best match, then lighter/heavier stand-ins.
std::string win = "C:\\Windows\\Fonts\\";
if (const char* r = std::getenv("SystemRoot"); r && *r) win = std::string(r) + "\\Fonts\\";
const std::string lb = "/usr/share/fonts/noto/NotoSans-Bold.ttf", ls = "/usr/share/fonts/noto/NotoSans-SemiBold.ttf",
lm = "/usr/share/fonts/noto/NotoSans-Medium.ttf", lr = "/usr/share/fonts/noto/NotoSans-Regular.ttf",
ldB = "/usr/share/fonts/TTF/DejaVuSans-Bold.ttf", ld = "/usr/share/fonts/TTF/DejaVuSans.ttf";
const std::string wb = win + "segoeuib.ttf", wsb = win + "segoeuisb.ttf", wr = win + "segoeui.ttf",
wab = win + "arialbd.ttf", wa = win + "arial.ttf";
const std::vector<std::string> bold{lb, ldB, wb, wab, ld, wa}, semi{ls, lb, wsb, wb, ldB, wab},
medium{lm, ls, lb, wr, wsb, ld, wa}, regular{lr, wr, ld, wa}, heavy{lb, ldB, wb, wab, ld, wa};
title.load(bold, 44);
head.load(semi, 30);
body.load(medium, 26);
label.load(medium, 22);
small.load(regular, 20);
tiny.load(semi, 17);
glyphFont.load(heavy, 96);
}
// Saves the settings like Frame Home expects (whole file, renamed into place: it applies them live).
void saveSettings(const PerfSettings& before) {