feat(color): add additional properties to the Lua LVGL arc object (#6062)

This commit is contained in:
philmoz
2025-04-10 10:05:54 +10:00
committed by GitHub
parent 5d499e6ec4
commit d4b475d877
5 changed files with 210 additions and 96 deletions
+28 -2
View File
@@ -395,7 +395,7 @@ void etx_bg_color_from_flags(lv_obj_t* obj, LcdFlags colorFlags,
if (colorFlags & RGB_FLAG) {
etx_remove_bg_color(obj, selector);
lv_obj_set_style_bg_color(obj,
makeLvColor(colorToRGB(colorFlags)), selector);
makeLvColor(colorFlags), selector);
} else {
lv_obj_remove_local_style_prop(obj, LV_STYLE_BG_COLOR, selector);
etx_bg_color(obj, (LcdColorIndex)COLOR_VAL(colorFlags), selector);
@@ -423,7 +423,7 @@ void etx_txt_color_from_flags(lv_obj_t* obj, LcdFlags colorFlags,
if (colorFlags & RGB_FLAG) {
etx_remove_txt_color(obj, selector);
lv_obj_set_style_text_color(obj,
makeLvColor(colorToRGB(colorFlags)), selector);
makeLvColor(colorFlags), selector);
} else {
lv_obj_remove_local_style_prop(obj, LV_STYLE_TEXT_COLOR, selector);
etx_txt_color(obj, (LcdColorIndex)COLOR_VAL(colorFlags), selector);
@@ -460,6 +460,19 @@ void etx_arc_color(lv_obj_t* obj, LcdColorIndex colorIdx,
etx_obj_add_style(obj, styles->arc_color[colorIdx], selector);
}
void etx_arc_color_from_flags(lv_obj_t* obj, LcdFlags colorFlags,
lv_style_selector_t selector)
{
if (colorFlags & RGB_FLAG) {
etx_remove_arc_color(obj, selector);
lv_obj_set_style_arc_color(obj,
makeLvColor(colorFlags), selector);
} else {
lv_obj_remove_local_style_prop(obj, LV_STYLE_ARC_COLOR, selector);
etx_arc_color(obj, (LcdColorIndex)COLOR_VAL(colorFlags), selector);
}
}
void etx_remove_line_color(lv_obj_t* obj, lv_style_selector_t selector)
{
// Remove styles
@@ -475,6 +488,19 @@ void etx_line_color(lv_obj_t* obj, LcdColorIndex colorIdx,
etx_obj_add_style(obj, styles->line_color[colorIdx], selector);
}
void etx_line_color_from_flags(lv_obj_t* obj, LcdFlags colorFlags,
lv_style_selector_t selector)
{
if (colorFlags & RGB_FLAG) {
etx_remove_line_color(obj, selector);
lv_obj_set_style_line_color(obj,
makeLvColor(colorFlags), selector);
} else {
lv_obj_remove_local_style_prop(obj, LV_STYLE_LINE_COLOR, selector);
etx_line_color(obj, (LcdColorIndex)COLOR_VAL(colorFlags), selector);
}
}
void etx_remove_img_color(lv_obj_t* obj, lv_style_selector_t selector)
{
// Remove styles
@@ -186,10 +186,14 @@ void etx_border_color(lv_obj_t* obj, LcdColorIndex colorIdx,
void etx_remove_arc_color(lv_obj_t* obj, lv_style_selector_t selector = LV_PART_MAIN);
void etx_arc_color(lv_obj_t* obj, LcdColorIndex colorIdx,
lv_style_selector_t selector = LV_PART_MAIN);
void etx_arc_color_from_flags(lv_obj_t* obj, LcdFlags colorFlags,
lv_style_selector_t selector = LV_PART_MAIN);
void etx_remove_line_color(lv_obj_t* obj, lv_style_selector_t selector = LV_PART_MAIN);
void etx_line_color(lv_obj_t* obj, LcdColorIndex colorIdx,
lv_style_selector_t selector = LV_PART_MAIN);
void etx_line_color_from_flags(lv_obj_t* obj, LcdFlags colorFlags,
lv_style_selector_t selector = LV_PART_MAIN);
void etx_remove_img_color(lv_obj_t* obj, lv_style_selector_t selector = LV_PART_MAIN);
void etx_img_color(lv_obj_t* obj, LcdColorIndex colorIdx,
+1 -1
View File
@@ -92,7 +92,7 @@ class TimerWidget : public Widget
lv_obj_set_style_arc_width(timerArc, TMR_ARC_W, LV_PART_MAIN);
lv_obj_set_style_arc_opa(timerArc, LV_OPA_COVER, LV_PART_INDICATOR);
lv_obj_set_style_arc_width(timerArc, TMR_ARC_W, LV_PART_INDICATOR);
etx_obj_add_style(timerArc, styles->arc_color[COLOR_THEME_SECONDARY1_INDEX], LV_PART_INDICATOR);
etx_arc_color(timerArc, COLOR_THEME_SECONDARY1_INDEX, LV_PART_INDICATOR);
lv_obj_add_flag(timerArc, LV_OBJ_FLAG_HIDDEN);
update();