Mirrors_UI_SDK/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2026-05-27 11:57:48 +08:00
Code Issues Actions 38 Packages Projects Releases Wiki Activity

fix: var redeclaration (#8109)

Browse Source
This commit is contained in:
André Costa
2025-04-15 19:24:57 +02:00
committed by GitHub
parent e150297232
commit dc8c529b7a
2 changed files with 45 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/draw/sw/lv_draw_sw.c
+1
View File
@@ -14,6 +14,7 @@
#include "../../display/lv_display_private.h" #include "../../display/lv_display_private.h"
#include "../../stdlib/lv_string.h" #include "../../stdlib/lv_string.h"
#include "../../core/lv_global.h" #include "../../core/lv_global.h"
#include "../../misc/lv_area_private.h"
#if LV_USE_VECTOR_GRAPHIC && LV_USE_THORVG #if LV_USE_VECTOR_GRAPHIC && LV_USE_THORVG
#if LV_USE_THORVG_EXTERNAL #if LV_USE_THORVG_EXTERNAL
src/draw/sw/lv_draw_sw_img.c
+44 -40
View File
@@ -134,57 +134,61 @@ void lv_draw_sw_layer(lv_draw_task_t * t, const lv_draw_image_dsc_t * draw_dsc,
#endif #endif
#if LV_USE_LAYER_DEBUG #if LV_USE_LAYER_DEBUG
lv_draw_fill_dsc_t fill_dsc; {
lv_draw_fill_dsc_init(&fill_dsc); lv_draw_fill_dsc_t fill_dsc;
fill_dsc.color = lv_color_hex(layer_to_draw->color_format == LV_COLOR_FORMAT_ARGB8888 ? 0xff0000 : 0x00ff00); lv_draw_fill_dsc_init(&fill_dsc);
fill_dsc.opa = LV_OPA_20; fill_dsc.color = lv_color_hex(layer_to_draw->color_format == LV_COLOR_FORMAT_ARGB8888 ? 0xff0000 : 0x00ff00);
lv_draw_sw_fill(t, &fill_dsc, &area_rot); fill_dsc.opa = LV_OPA_20;
lv_draw_sw_fill(t, &fill_dsc, &area_rot);
lv_draw_border_dsc_t border_dsc; lv_draw_border_dsc_t border_dsc;
lv_draw_border_dsc_init(&border_dsc); lv_draw_border_dsc_init(&border_dsc);
border_dsc.color = fill_dsc.color; border_dsc.color = fill_dsc.color;
border_dsc.opa = LV_OPA_60; border_dsc.opa = LV_OPA_60;
border_dsc.width = 2; border_dsc.width = 2;
lv_draw_sw_border(t, &border_dsc, &area_rot); lv_draw_sw_border(t, &border_dsc, &area_rot);
}
#endif #endif
#if LV_USE_PARALLEL_DRAW_DEBUG #if LV_USE_PARALLEL_DRAW_DEBUG
int32_t idx = t->draw_unit->idx; {
int32_t idx = t->draw_unit->idx;
lv_draw_fill_dsc_t fill_dsc; lv_draw_fill_dsc_t fill_dsc;
lv_draw_fill_dsc_init(&fill_dsc); lv_draw_fill_dsc_init(&fill_dsc);
fill_dsc.color = lv_palette_main(idx % LV_PALETTE_LAST); fill_dsc.color = lv_palette_main(idx % LV_PALETTE_LAST);
fill_dsc.opa = LV_OPA_10; fill_dsc.opa = LV_OPA_10;
lv_draw_sw_fill(t, &fill_dsc, &area_rot); lv_draw_sw_fill(t, &fill_dsc, &area_rot);
lv_draw_border_dsc_t border_dsc; lv_draw_border_dsc_t border_dsc;
lv_draw_border_dsc_init(&border_dsc); lv_draw_border_dsc_init(&border_dsc);
border_dsc.color = lv_palette_main(idx % LV_PALETTE_LAST); border_dsc.color = lv_palette_main(idx % LV_PALETTE_LAST);
border_dsc.opa = LV_OPA_60; border_dsc.opa = LV_OPA_60;
border_dsc.width = 1; border_dsc.width = 1;
lv_draw_sw_border(t, &border_dsc, &area_rot); lv_draw_sw_border(t, &border_dsc, &area_rot);
lv_point_t txt_size; lv_point_t txt_size;
lv_text_get_size(&txt_size, "W", LV_FONT_DEFAULT, 0, 0, 100, LV_TEXT_FLAG_NONE); lv_text_get_size(&txt_size, "W", LV_FONT_DEFAULT, 0, 0, 100, LV_TEXT_FLAG_NONE);
lv_area_t txt_area; lv_area_t txt_area;
txt_area.x1 = draw_area.x1; txt_area.x1 = draw_area.x1;
txt_area.x2 = draw_area.x1 + txt_size.x - 1; txt_area.x2 = draw_area.x1 + txt_size.x - 1;
txt_area.y2 = draw_area.y2; txt_area.y2 = draw_area.y2;
txt_area.y1 = draw_area.y2 - txt_size.y + 1; txt_area.y1 = draw_area.y2 - txt_size.y + 1;
lv_draw_fill_dsc_init(&fill_dsc); lv_draw_fill_dsc_init(&fill_dsc);
fill_dsc.color = lv_color_black(); fill_dsc.color = lv_color_black();
lv_draw_sw_fill(t, &fill_dsc, &txt_area); lv_draw_sw_fill(t, &fill_dsc, &txt_area);
char buf[8]; char buf[8];
lv_snprintf(buf, sizeof(buf), "%d", idx); lv_snprintf(buf, sizeof(buf), "%d", idx);
lv_draw_label_dsc_t label_dsc; lv_draw_label_dsc_t label_dsc;
lv_draw_label_dsc_init(&label_dsc); lv_draw_label_dsc_init(&label_dsc);
label_dsc.color = lv_color_white(); label_dsc.color = lv_color_white();
label_dsc.text = buf; label_dsc.text = buf;
lv_draw_sw_label(t, &label_dsc, &txt_area); lv_draw_sw_label(t, &label_dsc, &txt_area);
}
#endif #endif
} }