From bfd782e481c12e8ac23689cfc1955bbbb92ca486 Mon Sep 17 00:00:00 2001
From: kevin <kevin@lmve.net>
Date: Sun, 29 Mar 2026 21:55:42 +0800
Subject: [PATCH] =?UTF-8?q?up=EF=BC=8C=E4=B8=AD=E6=96=87=E5=AD=97=E7=AC=A6?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=90=91=E4=B8=8B=E6=8C=AA=E5=8A=A8=E4=B8=A4?=
 =?UTF-8?q?=E4=B8=AA=E5=83=8F=E7=B4=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .workbuddy/expert-history.json                                  | 2 +-
 .../src/graphics/draw/MessageRenderer.cpp                       | 2 +-
 .../src/graphics/fonts/ChineseFont12x12.h                       | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.workbuddy/expert-history.json b/.workbuddy/expert-history.json
index 9c1dd4c..e25ff7a 100644
--- a/.workbuddy/expert-history.json
+++ b/.workbuddy/expert-history.json
@@ -13,5 +13,5 @@
       }
     ]
   },
-  "lastUpdated": 1774789490425
+  "lastUpdated": 1774792487098
 }
\ No newline at end of file
diff --git a/code/firmware-2.7.15.567b8ea/src/graphics/draw/MessageRenderer.cpp b/code/firmware-2.7.15.567b8ea/src/graphics/draw/MessageRenderer.cpp
index edb8fea..b64c2d3 100644
--- a/code/firmware-2.7.15.567b8ea/src/graphics/draw/MessageRenderer.cpp
+++ b/code/firmware-2.7.15.567b8ea/src/graphics/draw/MessageRenderer.cpp
@@ -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);
             if (cp >= 0x80 && cfont12_find(cp)) {
                 hasCJK = true;
-                lineHeight = std::max(lineHeight, CFONT_H);
+                lineHeight = std::max(lineHeight, CFONT_H + 2); // +2 for cfont12_draw y offset
                 break;
             }
             ci += utf8len;
diff --git a/code/firmware-2.7.15.567b8ea/src/graphics/fonts/ChineseFont12x12.h b/code/firmware-2.7.15.567b8ea/src/graphics/fonts/ChineseFont12x12.h
index 7edaeb1..8357384 100644
--- a/code/firmware-2.7.15.567b8ea/src/graphics/fonts/ChineseFont12x12.h
+++ b/code/firmware-2.7.15.567b8ea/src/graphics/fonts/ChineseFont12x12.h
@@ -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){
   const CFontGlyph*g=cfont12_find(cp);
   if(!g)return 0;
+  y+=2;
   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)]);
     if(b&(0x80>>(c&7)))d->setPixel(x+c,y+r);