github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(draw): center imgfont's drawing position (#3668)

Browse Source 
Signed-off-by: pengyiqiang <pengyiqiang@xiaomi.com>
Co-authored-by: pengyiqiang <pengyiqiang@xiaomi.com>
Co-authored-by: Gabor Kiss-Vamosi <kisvegabor@gmail.com>
Co-authored-by: W-Mai <1341398182@qq.com>
This commit is contained in:
_VIFEXTech
2022-10-26 19:53:53 +08:00
committed by GitHub
parent 887f831c89
commit 677ab54bda
5 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
examples/others/imgfont/lv_example_imgfont_1.c
View File

@@ -7,10 +7,11 @@
LV_IMG_DECLARE(emoji_F617)
static bool get_imgfont_path(const lv_font_t * font, void * img_src,
uint16_t len, uint32_t unicode, uint32_t unicode_next,
void * user_data)
lv_coord_t * offset_y, void * user_data)
{
LV_UNUSED(font);
LV_UNUSED(unicode_next);
LV_UNUSED(offset_y);
LV_UNUSED(user_data);
LV_ASSERT_NULL(img_src);
@@ -22,11 +23,10 @@ static bool get_imgfont_path(const lv_font_t * font, void * img_src,
else {
char * path = (char *)img_src;
#if LV_USE_FFMPEG
snprintf(path, len, "%s/%04X.%s", "lvgl/examples/assets/emoji", unicode, "png");
lv_snprintf(path, len, "%s/%04X.png", "lvgl/examples/assets/emoji", unicode);
#elif LV_USE_PNG
snprintf(path, len, "%s/%04X.%s", "A:lvgl/examples/assets/emoji", unicode, "png");
lv_snprintf(path, len, "%s/%04X.png", "A:lvgl/examples/assets/emoji", unicode);
#endif
path[len - 1] = '\0';
}
return true;
@@ -40,6 +40,7 @@ void lv_example_imgfont_1(void)
lv_font_t * imgfont = lv_imgfont_create(80, get_imgfont_path, NULL);
if(imgfont == NULL) {
LV_LOG_ERROR("imgfont init error");
return;
}
imgfont->fallback = LV_FONT_DEFAULT;

3
examples/others/imgfont/lv_example_imgfont_1.py
View File

@@ -14,7 +14,7 @@ try:
except NameError:
script_path = ''
def get_imgfont_path(font, img_src, length, unicode, unicode_next,user_data) :
def get_imgfont_path(font, img_src, length, unicode, unicode_next, offset_y, user_data) :
if unicode < 0xf600:
return
if LV_USE_FFMPEG:
@@ -31,6 +31,7 @@ def get_imgfont_path(font, img_src, length, unicode, unicode_next,user_data) :
imgfont = lv.imgfont_create(80, get_imgfont_path, None)
if imgfont == None:
print("imgfont init error")
sys.exit(1)
imgfont.fallback = LV_FONT_DEFAULT