diff --git a/src/core/lv_obj.c b/src/core/lv_obj.c index ac9eb8e67c..fa19d4a980 100644 --- a/src/core/lv_obj.c +++ b/src/core/lv_obj.c @@ -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); diff --git a/src/core/lv_obj.h b/src/core/lv_obj.h index 21954e9931..49c71aac39 100644 --- a/src/core/lv_obj.h +++ b/src/core/lv_obj.h @@ -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. diff --git a/src/draw/opengles/lv_draw_opengles.c b/src/draw/opengles/lv_draw_opengles.c index c5fc17a304..03a251c3e0 100644 --- a/src/draw/opengles/lv_draw_opengles.c +++ b/src/draw/opengles/lv_draw_opengles.c @@ -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; diff --git a/src/draw/sdl/lv_draw_sdl.c b/src/draw/sdl/lv_draw_sdl.c index 01dc03006e..4b7d3dd77d 100644 --- a/src/draw/sdl/lv_draw_sdl.c +++ b/src/draw/sdl/lv_draw_sdl.c @@ -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; diff --git a/src/lv_api_map_v9_1.h b/src/lv_api_map_v9_1.h index 217c86caba..8a55c00352 100644 --- a/src/lv_api_map_v9_1.h +++ b/src/lv_api_map_v9_1.h @@ -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 diff --git a/src/others/xml/parsers/lv_xml_obj_parser.c b/src/others/xml/parsers/lv_xml_obj_parser.c index 845cc5c60a..95b07936af 100644 --- a/src/others/xml/parsers/lv_xml_obj_parser.c +++ b/src/others/xml/parsers/lv_xml_obj_parser.c @@ -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); diff --git a/xmls/lv_obj.xml b/xmls/lv_obj.xml index 70cf72abf0..4a064f4e13 100644 --- a/xmls/lv_obj.xml +++ b/xmls/lv_obj.xml @@ -65,28 +65,37 @@ Example - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file