Mirrors_UI_SDK/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2026-05-21 22:52:46 +08:00
Code Issues Actions 59 Packages Projects Releases Wiki Activity

refactor(obj): use lv_obj_set_flag instead of lv_obj_update_flag

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2025-04-11 08:20:04 +02:00
parent 3095b636a2
commit 3b394ac084
7 changed files with 76 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/lv_obj.c
+1 -1
View File
@@ -295,7 +295,7 @@ void lv_obj_remove_flag(lv_obj_t * obj, lv_obj_flag_t f)
}
void lv_obj_update_flag(lv_obj_t * obj, lv_obj_flag_t f, bool v)
void lv_obj_set_flag(lv_obj_t * obj, lv_obj_flag_t f, bool v)
{
if(v) lv_obj_add_flag(obj, f);
else lv_obj_remove_flag(obj, f);
src/core/lv_obj.h
+1 -1
View File
@@ -252,7 +252,7 @@ void lv_obj_remove_flag(lv_obj_t * obj, lv_obj_flag_t f);
* @param f OR-ed values from `lv_obj_flag_t` to update.
* @param v true: add the flags; false: remove the flags
*/
void lv_obj_update_flag(lv_obj_t * obj, lv_obj_flag_t f, bool v);
void lv_obj_set_flag(lv_obj_t * obj, lv_obj_flag_t f, bool v);
/**
* Add one or more states to the object. The other state bits will remain unchanged.
src/draw/opengles/lv_draw_opengles.c
+1 -1
View File
@@ -371,7 +371,7 @@ static bool draw_to_texture(lv_draw_opengles_unit_t * u, cache_data_t * cache_da
cache_data->texture = texture;
if(obj) {
lv_obj_update_flag(obj, LV_OBJ_FLAG_SEND_DRAW_TASK_EVENTS, original_send_draw_task_event);
lv_obj_set_flag(obj, LV_OBJ_FLAG_SEND_DRAW_TASK_EVENTS, original_send_draw_task_event);
}
return true;
src/draw/sdl/lv_draw_sdl.c
+1 -1
View File
@@ -334,7 +334,7 @@ static bool draw_to_texture(lv_draw_sdl_unit_t * u, cache_data_t * cache_data)
cache_data->texture = texture;
if(obj) {
lv_obj_update_flag(obj, LV_OBJ_FLAG_SEND_DRAW_TASK_EVENTS, original_send_draw_task_event);
lv_obj_set_flag(obj, LV_OBJ_FLAG_SEND_DRAW_TASK_EVENTS, original_send_draw_task_event);
}
return true;
src/lv_api_map_v9_1.h
+2 -1
View File
@@ -77,7 +77,8 @@ extern "C" {
#define _lv_disp_refr_timer lv_disp_refr_timer
#define _lv_disp_get_refr_timer lv_disp_get_refr_timer
#define lv_obj_get_child_by_id lv_obj_find_by_id
#define lv_obj_get_child_by_id lv_obj_find_by_id
#define lv_obj_update_flag lv_obj_set_flag
#define _lv_inv_area lv_inv_area
#define lv_chart_set_all_value lv_chart_set_all_values
src/others/xml/parsers/lv_xml_obj_parser.c
+38 -38
View File
@@ -68,44 +68,44 @@ void lv_xml_obj_apply(lv_xml_parser_state_t * state, const char ** attrs)
else if(lv_streq("flex_flow", name)) lv_obj_set_flex_flow(item, lv_xml_flex_flow_to_enum(value));
else if(lv_streq("flex_grow", name)) lv_obj_set_flex_grow(item, lv_xml_atoi(value));
else if(lv_streq("hidden", name)) lv_obj_update_flag(item, LV_OBJ_FLAG_HIDDEN, lv_xml_to_bool(value));
else if(lv_streq("clickable", name)) lv_obj_update_flag(item, LV_OBJ_FLAG_CLICKABLE, lv_xml_to_bool(value));
else if(lv_streq("click_focusable", name)) lv_obj_update_flag(item, LV_OBJ_FLAG_CLICK_FOCUSABLE,
lv_xml_to_bool(value));
else if(lv_streq("checkable", name)) lv_obj_update_flag(item, LV_OBJ_FLAG_CHECKABLE, lv_xml_to_bool(value));
else if(lv_streq("scrollable", name)) lv_obj_update_flag(item, LV_OBJ_FLAG_SCROLLABLE, lv_xml_to_bool(value));
else if(lv_streq("scroll_elastic", name)) lv_obj_update_flag(item, LV_OBJ_FLAG_SCROLL_ELASTIC,
lv_xml_to_bool(value));
else if(lv_streq("scroll_momentum", name)) lv_obj_update_flag(item, LV_OBJ_FLAG_SCROLL_MOMENTUM,
lv_xml_to_bool(value));
else if(lv_streq("scroll_one", name)) lv_obj_update_flag(item, LV_OBJ_FLAG_SCROLL_ONE, lv_xml_to_bool(value));
else if(lv_streq("scroll_chain_hor", name)) lv_obj_update_flag(item, LV_OBJ_FLAG_SCROLL_CHAIN_HOR,
lv_xml_to_bool(value));
else if(lv_streq("scroll_chain_ver", name)) lv_obj_update_flag(item, LV_OBJ_FLAG_SCROLL_CHAIN_VER,
lv_xml_to_bool(value));
else if(lv_streq("scroll_chain", name)) lv_obj_update_flag(item, LV_OBJ_FLAG_SCROLL_CHAIN,
lv_xml_to_bool(value));
else if(lv_streq("scroll_on_focus", name)) lv_obj_update_flag(item, LV_OBJ_FLAG_SCROLL_ON_FOCUS,
lv_xml_to_bool(value));
else if(lv_streq("scroll_with_arrow", name)) lv_obj_update_flag(item, LV_OBJ_FLAG_SCROLL_WITH_ARROW,
lv_xml_to_bool(value));
else if(lv_streq("snappable", name)) lv_obj_update_flag(item, LV_OBJ_FLAG_SNAPPABLE, lv_xml_to_bool(value));
else if(lv_streq("press_lock", name)) lv_obj_update_flag(item, LV_OBJ_FLAG_PRESS_LOCK, lv_xml_to_bool(value));
else if(lv_streq("event_bubble", name)) lv_obj_update_flag(item, LV_OBJ_FLAG_EVENT_BUBBLE,
lv_xml_to_bool(value));
else if(lv_streq("gesture_bubble", name)) lv_obj_update_flag(item, LV_OBJ_FLAG_GESTURE_BUBBLE,
lv_xml_to_bool(value));
else if(lv_streq("adv_hittest", name)) lv_obj_update_flag(item, LV_OBJ_FLAG_ADV_HITTEST,
lv_xml_to_bool(value));
else if(lv_streq("ignore_layout", name)) lv_obj_update_flag(item, LV_OBJ_FLAG_IGNORE_LAYOUT,
lv_xml_to_bool(value));
else if(lv_streq("floating", name)) lv_obj_update_flag(item, LV_OBJ_FLAG_FLOATING, lv_xml_to_bool(value));
else if(lv_streq("send_draw_task_events", name))lv_obj_update_flag(item, LV_OBJ_FLAG_SEND_DRAW_TASK_EVENTS,
lv_xml_to_bool(value));
else if(lv_streq("overflow_visible", name)) lv_obj_update_flag(item, LV_OBJ_FLAG_OVERFLOW_VISIBLE,
lv_xml_to_bool(value));
else if(lv_streq("flex_in_new_track", name)) lv_obj_update_flag(item, LV_OBJ_FLAG_FLEX_IN_NEW_TRACK,
lv_xml_to_bool(value));
else if(lv_streq("hidden", name)) lv_obj_set_flag(item, LV_OBJ_FLAG_HIDDEN, lv_xml_to_bool(value));
else if(lv_streq("clickable", name)) lv_obj_set_flag(item, LV_OBJ_FLAG_CLICKABLE, lv_xml_to_bool(value));
else if(lv_streq("click_focusable", name)) lv_obj_set_flag(item, LV_OBJ_FLAG_CLICK_FOCUSABLE,
lv_xml_to_bool(value));
else if(lv_streq("checkable", name)) lv_obj_set_flag(item, LV_OBJ_FLAG_CHECKABLE, lv_xml_to_bool(value));
else if(lv_streq("scrollable", name)) lv_obj_set_flag(item, LV_OBJ_FLAG_SCROLLABLE, lv_xml_to_bool(value));
else if(lv_streq("scroll_elastic", name)) lv_obj_set_flag(item, LV_OBJ_FLAG_SCROLL_ELASTIC,
lv_xml_to_bool(value));
else if(lv_streq("scroll_momentum", name)) lv_obj_set_flag(item, LV_OBJ_FLAG_SCROLL_MOMENTUM,
lv_xml_to_bool(value));
else if(lv_streq("scroll_one", name)) lv_obj_set_flag(item, LV_OBJ_FLAG_SCROLL_ONE, lv_xml_to_bool(value));
else if(lv_streq("scroll_chain_hor", name)) lv_obj_set_flag(item, LV_OBJ_FLAG_SCROLL_CHAIN_HOR,
lv_xml_to_bool(value));
else if(lv_streq("scroll_chain_ver", name)) lv_obj_set_flag(item, LV_OBJ_FLAG_SCROLL_CHAIN_VER,
lv_xml_to_bool(value));
else if(lv_streq("scroll_chain", name)) lv_obj_set_flag(item, LV_OBJ_FLAG_SCROLL_CHAIN,
lv_xml_to_bool(value));
else if(lv_streq("scroll_on_focus", name)) lv_obj_set_flag(item, LV_OBJ_FLAG_SCROLL_ON_FOCUS,
lv_xml_to_bool(value));
else if(lv_streq("scroll_with_arrow", name)) lv_obj_set_flag(item, LV_OBJ_FLAG_SCROLL_WITH_ARROW,
lv_xml_to_bool(value));
else if(lv_streq("snappable", name)) lv_obj_set_flag(item, LV_OBJ_FLAG_SNAPPABLE, lv_xml_to_bool(value));
else if(lv_streq("press_lock", name)) lv_obj_set_flag(item, LV_OBJ_FLAG_PRESS_LOCK, lv_xml_to_bool(value));
else if(lv_streq("event_bubble", name)) lv_obj_set_flag(item, LV_OBJ_FLAG_EVENT_BUBBLE,
lv_xml_to_bool(value));
else if(lv_streq("gesture_bubble", name)) lv_obj_set_flag(item, LV_OBJ_FLAG_GESTURE_BUBBLE,
lv_xml_to_bool(value));
else if(lv_streq("adv_hittest", name)) lv_obj_set_flag(item, LV_OBJ_FLAG_ADV_HITTEST,
lv_xml_to_bool(value));
else if(lv_streq("ignore_layout", name)) lv_obj_set_flag(item, LV_OBJ_FLAG_IGNORE_LAYOUT,
lv_xml_to_bool(value));
else if(lv_streq("floating", name)) lv_obj_set_flag(item, LV_OBJ_FLAG_FLOATING, lv_xml_to_bool(value));
else if(lv_streq("send_draw_task_events", name))lv_obj_set_flag(item, LV_OBJ_FLAG_SEND_DRAW_TASK_EVENTS,
lv_xml_to_bool(value));
else if(lv_streq("overflow_visible", name)) lv_obj_set_flag(item, LV_OBJ_FLAG_OVERFLOW_VISIBLE,
lv_xml_to_bool(value));
else if(lv_streq("flex_in_new_track", name)) lv_obj_set_flag(item, LV_OBJ_FLAG_FLEX_IN_NEW_TRACK,
lv_xml_to_bool(value));
else if(lv_streq("styles", name)) lv_xml_style_add_to_obj(state, item, value);
xmls/lv_obj.xml
+32 -23
View File
@@ -65,28 +65,37 @@ Example
<prop name="flex_grow" type="int"/>
<prop name="flex_flow" type="enum:lv_flex_flow"/>
<prop name="hidden" type="flag:flag"/>
<prop name="clickable" type="flag:flag"/>
<prop name="click_focusable" type="flag:flag"/>
<prop name="checkable" type="flag:flag"/>
<prop name="scrollable" type="flag:flag"/>
<prop name="scroll_elastic" type="flag:flag"/>
<prop name="scroll_momentum" type="flag:flag"/>
<prop name="scroll_one" type="flag:flag"/>
<prop name="scroll_chain_hor" type="flag:flag"/>
<prop name="scroll_chain_ver" type="flag:flag"/>
<prop name="scroll_chain" type="flag:flag"/>
<prop name="scroll_on_focus" type="flag:flag"/>
<prop name="scroll_with_arrow" type="flag:flag"/>
<prop name="snappable" type="flag:flag"/>
<prop name="press_lock" type="flag:flag"/>
<prop name="event_bubble" type="flag:flag"/>
<prop name="gesture_bubble" type="flag:flag"/>
<prop name="adv_hittest" type="flag:flag"/>
<prop name="ignore_layout" type="flag:flag"/>
<prop name="floating" type="flag:flag"/>
<prop name="send_draw_task_events" type="flag:flag"/>
<prop name="overflow_visible" type="flag:flag"/>
<prop name="flex_in_new_track" type="flag:flag"/>
<prop name="checked" type="flag:state lv_state"/>
<prop name="focused" type="flag:state lv_state"/>
<prop name="focus_key" type="flag:state lv_state"/>
<prop name="edited" type="flag:state lv_state"/>
<prop name="hovered" type="flag:state lv_state"/>
<prop name="pressed" type="flag:state lv_state"/>
<prop name="scrolled" type="flag:state lv_state"/>
<prop name="disabled" type="flag:state lv_state"/>
<prop name="hidden" type="flag:flag lv_obj_flag"/>
<prop name="clickable" type="flag:flag lv_obj_flag"/>
<prop name="click_focusable" type="flag:flag lv_obj_flag"/>
<prop name="checkable" type="flag:flag lv_obj_flag"/>
<prop name="scrollable" type="flag:flag lv_obj_flag"/>
<prop name="scroll_elastic" type="flag:flag lv_obj_flag"/>
<prop name="scroll_momentum" type="flag:flag lv_obj_flag"/>
<prop name="scroll_one" type="flag:flag lv_obj_flag"/>
<prop name="scroll_chain_hor" type="flag:flag lv_obj_flag"/>
<prop name="scroll_chain_ver" type="flag:flag lv_obj_flag"/>
<prop name="scroll_chain" type="flag:flag lv_obj_flag"/>
<prop name="scroll_on_focus" type="flag:flag lv_obj_flag"/>
<prop name="scroll_with_arrow" type="flag:flag lv_obj_flag"/>
<prop name="snappable" type="flag:flag lv_obj_flag"/>
<prop name="press_lock" type="flag:flag lv_obj_flag"/>
<prop name="event_bubble" type="flag:flag lv_obj_flag"/>
<prop name="gesture_bubble" type="flag:flag lv_obj_flag"/>
<prop name="adv_hittest" type="flag:flag lv_obj_flag"/>
<prop name="ignore_layout" type="flag:flag lv_obj_flag"/>
<prop name="floating" type="flag:flag lv_obj_flag"/>
<prop name="send_draw_task_events" type="flag:flag lv_obj_flag"/>
<prop name="overflow_visible" type="flag:flag lv_obj_flag"/>
<prop name="flex_in_new_track" type="flag:flag lv_obj_flag"/>
</api>
</widget>