kevin/lora_meshtastic_project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

up，中文字符显示向下挪动两个像素

Browse Source
This commit is contained in:
kevin
2026-03-29 21:55:42 +08:00
parent 069630999e
commit bfd782e481
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.workbuddy/expert-history.json
+1 -1
View File
@@ -13,5 +13,5 @@
} }
] ]
}, },
"lastUpdated": 1774789490425 "lastUpdated": 1774792487098
} }
code/firmware-2.7.15.567b8ea/src/graphics/draw/MessageRenderer.cpp
+1 -1
View File
@@ -554,7 +554,7 @@ std::vector<int> calculateLineHeights(const std::vector<std::string> &lines, con
uint16_t cp = cfont12_utf8(_line.c_str() + ci, &utf8len); uint16_t cp = cfont12_utf8(_line.c_str() + ci, &utf8len);
if (cp >= 0x80 && cfont12_find(cp)) { if (cp >= 0x80 && cfont12_find(cp)) {
hasCJK = true; hasCJK = true;
lineHeight = std::max(lineHeight, CFONT_H); lineHeight = std::max(lineHeight, CFONT_H + 2); // +2 for cfont12_draw y offset
break; break;
} }
ci += utf8len; ci += utf8len;
code/firmware-2.7.15.567b8ea/src/graphics/fonts/ChineseFont12x12.h
+1
View File
@@ -21109,6 +21109,7 @@ inline const CFontGlyph* cfont12_find(uint16_t cp) {
inline int cfont12_draw(OLEDDisplay*d,int x,int y,uint16_t cp){ inline int cfont12_draw(OLEDDisplay*d,int x,int y,uint16_t cp){
const CFontGlyph*g=cfont12_find(cp); const CFontGlyph*g=cfont12_find(cp);
if(!g)return 0; if(!g)return 0;
y+=2;
for(int r=0;r<CFONT_H;r++)for(int c=0;c<CFONT_W;c++){ for(int r=0;r<CFONT_H;r++)for(int c=0;c<CFONT_W;c++){
uint8_t b=pgm_read_byte(&g->bmp[r*CFONT_BPR+(c>>3)]); uint8_t b=pgm_read_byte(&g->bmp[r*CFONT_BPR+(c>>3)]);
if(b&(0x80>>(c&7)))d->setPixel(x+c,y+r); if(b&(0x80>>(c&7)))d->setPixel(x+c,y+r);