Skip to content

Commit

Permalink
update LVGL
Browse files Browse the repository at this point in the history
  • Loading branch information
kisvegabor committed Nov 14, 2023
1 parent b0f59d7 commit 68636a1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions examples/Dynamic_loading_font_example.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@
scr.clean()

myfont_cn = lv.font_t()
lv.font_load(myfont_cn, "S:%s/font/font-PHT-cn-20.bin" % script_path)
lv.binfont_load(myfont_cn, "S:%s/font/font-PHT-cn-20.bin" % script_path)

label1 = lv.label(scr)
label1.set_style_text_font(myfont_cn, 0) # set the font
label1.set_text("上中下乎")
label1.align(lv.ALIGN.CENTER, 0, -25)

myfont_en = lv.font_t()
lv.font_load(myfont_en, "S:%s/font/font-PHT-en-20.bin" % script_path)
lv.binfont_load(myfont_en, "S:%s/font/font-PHT-en-20.bin" % script_path)

label2 = lv.label(scr)
label2.set_style_text_font(myfont_en, 0) # set the font
Expand All @@ -56,7 +56,7 @@


myfont_jp= lv.font_t()
lv.font_load(myfont_jp, "S:%s/font/font-PHT-jp-20.bin" % script_path)
lv.binfont_load(myfont_jp, "S:%s/font/font-PHT-jp-20.bin" % script_path)

label3 = lv.label(scr)
label3.set_style_text_font(myfont_jp, 0) # set the font
Expand Down
2 changes: 1 addition & 1 deletion lvgl
Submodule lvgl updated 52 files
+1 −1 demos/benchmark/lv_demo_benchmark.c
+2 −2 demos/widgets/lv_demo_widgets.c
+1 −2 docs/ROADMAP.rst
+10 −9 docs/overview/font.rst
+0 −9 docs/overview/style-props.md
+0 −108 examples/assets/imgbtn_left.c
+0 −106 examples/assets/imgbtn_mid.c
+0 −108 examples/assets/imgbtn_right.c
+3 −1 examples/others/ime/lv_example_ime_pinyin_1.py
+3 −1 examples/others/ime/lv_example_ime_pinyin_2.py
+2 −1 examples/widgets/canvas/lv_example_canvas_4.py
+4 −2 examples/widgets/label/lv_example_label_3.py
+1 −1 lvgl.h
+0 −4 scripts/style_api_gen.py
+0 −1 src/core/lv_obj_event.c
+4 −6 src/core/lv_obj_scroll.c
+1 −12 src/core/lv_obj_style_gen.c
+1 −9 src/core/lv_obj_style_gen.h
+7 −1 src/dev/nuttx/lv_nuttx_entry.c
+22 −3 src/dev/nuttx/lv_nuttx_fbdev.c
+32 −3 src/dev/nuttx/lv_nuttx_lcd.c
+7 −0 src/dev/nuttx/lv_nuttx_libuv.c
+27 −8 src/dev/nuttx/lv_nuttx_touchscreen.c
+15 −0 src/dev/sdl/lv_sdl_keyboard.c
+15 −0 src/dev/sdl/lv_sdl_mouse.c
+15 −0 src/dev/sdl/lv_sdl_mousewheel.c
+9 −13 src/dev/sdl/lv_sdl_window.c
+3 −0 src/display/lv_display.c
+18 −1 src/display/lv_display.h
+264 −215 src/draw/lv_image_decoder.c
+2 −2 src/draw/sw/lv_draw_sw_img.c
+5 −5 src/font/lv_binfont_loader.c
+5 −5 src/font/lv_binfont_loader.h
+140 −72 src/indev/lv_indev.c
+42 −0 src/indev/lv_indev.h
+2 −4 src/indev/lv_indev_private.h
+1 −1 src/libs/fsdrv/lv_fs_memfs.c
+54 −6 src/misc/lv_anim.c
+18 −6 src/misc/lv_anim.h
+0 −1 src/misc/lv_style.c
+0 −1 src/misc/lv_style.h
+0 −10 src/misc/lv_style_gen.c
+0 −7 src/misc/lv_style_gen.h
+20 −7 src/others/ime/lv_ime_pinyin.c
+4 −3 src/others/sysmon/lv_sysmon.c
+1 −0 src/widgets/keyboard/lv_keyboard.c
+8 −8 src/widgets/label/lv_label.c
+ tests/ref_imgs/draw/image_format_rle.png
+ tests/ref_imgs/draw/image_format_rle_rotate.png
+ tests/ref_imgs/draw/image_format_rle_rotate_recolor.png
+9 −0 tests/src/test_cases/draw/test_image_formats.c
+11 −13 tests/src/test_cases/test_font_loader.c

0 comments on commit 68636a1

Please sign in to comment.