eric/Crosspoint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: handle fallbacks for advance table and prewarm (#1929)

Browse Source 
## Summary
- Fixes #1928 by having the prewarm and advance table functions resolve
fallback styles
---

### AI Usage
Did you use AI tools to help write this code?  YES - Codex

---------

Co-authored-by: Uri Tauber <uritaube@gmail.com>
# Conflicts:
#	lib/EpdFont/SdCardFont.cpp
This commit is contained in:
Chun Ming Lee
2026-05-15 11:44:20 -05:00
committed by Zach Nelson
parent b971f7bda4
commit fd79074d43
3 changed files with 41 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/GfxRenderer/GfxRenderer.cpp
+1 -17
View File
@@ -19,23 +19,7 @@ const char* resolveVisualText(const char* text, std::string& visualBuffer, int p
* Falls back gracefully when the font lacks the requested variant.
*/
uint8_t resolveSdCardStyle(const SdCardFont& font, const EpdFontFamily::Style style) {
// Indexed by styleBits (0=REGULAR, 1=BOLD, 2=ITALIC, 3=BOLD_ITALIC)
static const uint8_t kFallbacks[4][4] = {
// REGULAR: REGULAR → BOLD → ITALIC → BOLD_ITALIC
{EpdFontFamily::REGULAR, EpdFontFamily::BOLD, EpdFontFamily::ITALIC, EpdFontFamily::BOLD_ITALIC},
// BOLD: BOLD → BOLD_ITALIC → REGULAR → ITALIC
{EpdFontFamily::BOLD, EpdFontFamily::BOLD_ITALIC, EpdFontFamily::REGULAR, EpdFontFamily::ITALIC},
// ITALIC: ITALIC → REGULAR → BOLD → BOLD_ITALIC (REGULAR before BOLD!)
{EpdFontFamily::ITALIC, EpdFontFamily::REGULAR, EpdFontFamily::BOLD, EpdFontFamily::BOLD_ITALIC},
// BOLD_ITALIC: BOLD_ITALIC → BOLD → ITALIC → REGULAR
{EpdFontFamily::BOLD_ITALIC, EpdFontFamily::BOLD, EpdFontFamily::ITALIC, EpdFontFamily::REGULAR},
};
const uint8_t styleBits = static_cast<uint8_t>(style) & 0x03;
for (uint8_t candidate : kFallbacks[styleBits]) {
if (font.hasStyle(candidate)) return candidate;
}
return EpdFontFamily::REGULAR; // no-variant-at-all safety net
return font.resolveStyle(static_cast<uint8_t>(style));
}
} // namespace