From 1b3c4e7c2569ffdccad283c4906ba94862c13eea Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Wed, 26 May 2021 15:30:48 +0200 Subject: [PATCH] fix(example) fix the overlapping texts in lv_example_label_3 --- examples/widgets/label/lv_example_label_3.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/widgets/label/lv_example_label_3.c b/examples/widgets/label/lv_example_label_3.c index 7dffcd348..e80dd24e5 100644 --- a/examples/widgets/label/lv_example_label_3.c +++ b/examples/widgets/label/lv_example_label_3.c @@ -7,23 +7,23 @@ void lv_example_label_3(void) { lv_obj_t * ltr_label = lv_label_create(lv_scr_act()); - lv_label_set_text(ltr_label, "An embedded system is a computer system - a combination of a computer processor, computer memory, and input/output peripheral devices..."); + lv_label_set_text(ltr_label, "In modern terminology, a microcontroller is similar to a system on a chip (SoC)."); lv_obj_set_style_text_font(ltr_label, &lv_font_montserrat_16, 0); - lv_obj_set_width(ltr_label, 300); - lv_obj_align(ltr_label, LV_ALIGN_TOP_LEFT, 10, 10); + lv_obj_set_width(ltr_label, 310); + lv_obj_align(ltr_label, LV_ALIGN_TOP_LEFT, 5, 5); lv_obj_t * rtl_label = lv_label_create(lv_scr_act()); - lv_label_set_text(rtl_label, "RTL:\nמערכת משובצת מחשב (באנגלית: Embedded system) היא מערכת או מכשיר, בו משולב מחשב (או, ליתר דיוק, מעבד) המבצע רק פונקציות ספציפיות המיועדות לתפעול המערכת או המכשיר."); + lv_label_set_text(rtl_label, "מעבד, או בשמו המלא יחידת עיבוד מרכזית (באנגלית: CPU - Central Processing Unit)."); lv_obj_set_style_base_dir(rtl_label, LV_BASE_DIR_RTL, 0); lv_obj_set_style_text_font(rtl_label, &lv_font_dejavu_16_persian_hebrew, 0); - lv_obj_set_width(rtl_label, 300); - lv_obj_align(rtl_label, LV_ALIGN_LEFT_MID, 10, 0); + lv_obj_set_width(rtl_label, 310); + lv_obj_align(rtl_label, LV_ALIGN_LEFT_MID, 5, 0); lv_obj_t * cz_label = lv_label_create(lv_scr_act()); - lv_label_set_text(cz_label, "嵌入式系统（Embedded System），是一种嵌入机械或电气系统内部、具有专一功能和实时计算性能的计算机系统。"); + lv_label_set_text(cz_label, "嵌入式系统（Embedded System），\n是一种嵌入机械或电气系统内部、具有专一功能和实时计算性能的计算机系统。"); lv_obj_set_style_text_font(cz_label, &lv_font_simsun_16_cjk, 0); - lv_obj_set_width(cz_label, 300); - lv_obj_align(cz_label, LV_ALIGN_BOTTOM_LEFT, 10, -50); + lv_obj_set_width(cz_label, 310); + lv_obj_align(cz_label, LV_ALIGN_BOTTOM_LEFT, 5, -5); } #endif