Mirrors/MeshCore-Solo
1
0
Fork 0
mirror of https://github.com/MarekZegare4/MeshCore-Solo.git synced 2026-08-01 17:56:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(eink): fix font layout and add Lemon font support to GxEPDDisplay

Browse Source 
Layout fix: GxEPDDisplay was using proportional GFX fonts (FreeSans9pt/12pt)
for sizes 1 and 2, giving lineHeight=16/20 instead of the 8/16 the UI layout
expects (designed for the OLED's bitmap font). Replaced with the GFX built-in
6×8 bitmap font (size 1) and its 2× scaled variant 12×16 (size 2). Size 3
keeps FreeSans18pt for large headings. fontAscender updated accordingly:
built-in font cursor is top-left (offset=0), Lemon GFX font adds 8px,
only FreeSans18pt still adds 26px.

Lemon font: LemonFont.h already stores the font in GFXfont format, so
GxEPDDisplay can use it directly via display.setFont(&Lemon). Added
_use_lemon flag, setLemonFont() override, and size-1 font selection in
setTextSize()/startFrame(). Adafruit GFX handles UTF-8 decoding for GFX
fonts, so Unicode characters (Cyrillic etc.) render correctly. The FONT
setting in SettingsScreen now works on e-ink the same as on OLED.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Jakub
2026-05-22 17:20:20 +02:00
co-authored by Claude Sonnet 4.6
parent 0b6aaff49b
commit 4c37986737
2 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/helpers/ui/GxEPDDisplay.cpp
+19 -9
View File
@@ -16,10 +16,10 @@
// GFX fonts use the baseline as the cursor origin. UI code assumes top-of-cell
// coordinates (same convention as the OLED driver). Add the font ascender so
// the two conventions match.
static int fontAscender(int sz) {
if (sz == 3) return 26; // FreeSans18pt7b
if (sz == 2) return 17; // FreeSansBold12pt7b
return 13; // FreeSans9pt7b (sz == 1)
static int fontAscender(int sz, bool use_lemon) {
if (sz == 3) return 26; // FreeSans18pt7b: proportional font, baseline origin
if (use_lemon) return 8; // Lemon GFX font: baseline origin, typical ascender 8px
return 0; // GFX built-in font: cursor is top-left of cell
}
bool GxEPDDisplay::begin() {
@@ -72,7 +72,8 @@ void GxEPDDisplay::startFrame(Color bkg) {
display.fillScreen(GxEPD_WHITE);
display.setTextColor(_curr_color = GxEPD_BLACK);
_text_sz = 1;
display.setFont(&FreeSans9pt7b);
display.setFont(_use_lemon ? &Lemon : NULL);
display.setTextSize(1);
display_crc.reset();
}
@@ -80,9 +81,18 @@ void GxEPDDisplay::setTextSize(int sz) {
_text_sz = sz;
display_crc.update<int>(sz);
switch (sz) {
case 2: display.setFont(&FreeSansBold12pt7b); break;
case 3: display.setFont(&FreeSans18pt7b); break;
default: display.setFont(&FreeSans9pt7b); break;
case 3:
display.setFont(&FreeSans18pt7b);
display.setTextSize(1);
break;
case 2:
display.setFont(NULL);
display.setTextSize(2);
break;
default:
display.setFont(_use_lemon ? &Lemon : NULL);
display.setTextSize(1);
break;
}
}
@@ -101,7 +111,7 @@ void GxEPDDisplay::setCursor(int x, int y) {
display_crc.update<int>(y);
// Offset y by the font ascender: callers pass top-of-cell y, GFX fonts
// expect baseline y. Without this, text would be clipped at the top.
display.setCursor(x, y + fontAscender(_text_sz));
display.setCursor(x, y + fontAscender(_text_sz, _use_lemon));
}
void GxEPDDisplay::print(const char* str) {