From e697807cf5c01be2531fc52df78ecad75ce39a7a Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Wed, 9 Jun 2021 16:05:26 +0200 Subject: [PATCH] fix(typo) rename LV_OBJ_FLAG_SNAPABLE to LV_OBJ_FLAG_SNAPPABLE --- examples/scroll/lv_example_scroll_2.c | 2 +- src/core/lv_indev_scroll.c | 4 ++-- src/core/lv_obj.c | 2 +- src/core/lv_obj.h | 2 +- src/lv_api_map.h | 7 ++++--- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/examples/scroll/lv_example_scroll_2.c b/examples/scroll/lv_example_scroll_2.c index 852676c07..a783c9792 100644 --- a/examples/scroll/lv_example_scroll_2.c +++ b/examples/scroll/lv_example_scroll_2.c @@ -33,7 +33,7 @@ void lv_example_scroll_2(void) lv_obj_t * label = lv_label_create(btn); if(i == 3) { lv_label_set_text_fmt(label, "Panel %d\nno snap", i); - lv_obj_clear_flag(btn, LV_OBJ_FLAG_SNAPABLE); + lv_obj_clear_flag(btn, LV_OBJ_FLAG_SNAPPABLE); } else { lv_label_set_text_fmt(label, "Panel %d", i); } diff --git a/src/core/lv_indev_scroll.c b/src/core/lv_indev_scroll.c index ff386aefc..c088d40d0 100644 --- a/src/core/lv_indev_scroll.c +++ b/src/core/lv_indev_scroll.c @@ -422,7 +422,7 @@ static lv_coord_t find_snap_point_x(const lv_obj_t * obj, lv_coord_t min, lv_coo for(i = 0; i < lv_obj_get_child_cnt(obj); i++) { lv_obj_t * child = lv_obj_get_child(obj, i); if(lv_obj_has_flag_any(child, LV_OBJ_FLAG_HIDDEN | LV_OBJ_FLAG_FLOATING)) continue; - if(lv_obj_has_flag(child, LV_OBJ_FLAG_SNAPABLE)) { + if(lv_obj_has_flag(child, LV_OBJ_FLAG_SNAPPABLE)) { lv_coord_t x_child = 0; lv_coord_t x_parent = 0; switch(align) { @@ -476,7 +476,7 @@ static lv_coord_t find_snap_point_y(const lv_obj_t * obj, lv_coord_t min, lv_coo for(i = 0; i < lv_obj_get_child_cnt(obj); i++) { lv_obj_t * child = lv_obj_get_child(obj, i); if(lv_obj_has_flag_any(child, LV_OBJ_FLAG_HIDDEN | LV_OBJ_FLAG_FLOATING)) continue; - if(lv_obj_has_flag(child, LV_OBJ_FLAG_SNAPABLE)) { + if(lv_obj_has_flag(child, LV_OBJ_FLAG_SNAPPABLE)) { lv_coord_t y_child = 0; lv_coord_t y_parent = 0; switch(align) { diff --git a/src/core/lv_obj.c b/src/core/lv_obj.c index 296d733cc..9130de6d9 100644 --- a/src/core/lv_obj.c +++ b/src/core/lv_obj.c @@ -369,7 +369,7 @@ static void lv_obj_constructor(const lv_obj_class_t * class_p, lv_obj_t * obj) /*Set attributes*/ obj->flags = LV_OBJ_FLAG_CLICKABLE; - obj->flags |= LV_OBJ_FLAG_SNAPABLE; + obj->flags |= LV_OBJ_FLAG_SNAPPABLE; if(parent) obj->flags |= LV_OBJ_FLAG_PRESS_LOCK; if(parent) obj->flags |= LV_OBJ_FLAG_SCROLL_CHAIN; obj->flags |= LV_OBJ_FLAG_CLICK_FOCUSABLE; diff --git a/src/core/lv_obj.h b/src/core/lv_obj.h index ccd0e5139..a1d9afb5b 100644 --- a/src/core/lv_obj.h +++ b/src/core/lv_obj.h @@ -97,7 +97,7 @@ enum { LV_OBJ_FLAG_SCROLL_ONE = (1 << 7), /**< Allow scrolling only one snapable children*/ LV_OBJ_FLAG_SCROLL_CHAIN = (1 << 8), /**< Allow propagating the scroll to a parent*/ LV_OBJ_FLAG_SCROLL_ON_FOCUS = (1 << 9), /**< Automatically scroll object to make it visible when focused*/ - LV_OBJ_FLAG_SNAPABLE = (1 << 10), /**< If scroll snap is enabled on the parent it can snap to this object*/ + LV_OBJ_FLAG_SNAPPABLE = (1 << 10), /**< If scroll snap is enabled on the parent it can snap to this object*/ LV_OBJ_FLAG_PRESS_LOCK = (1 << 11), /**< Keep the object pressed even if the press slid from the object*/ LV_OBJ_FLAG_EVENT_BUBBLE = (1 << 12), /**< Propagate the events to the parent too*/ LV_OBJ_FLAG_GESTURE_BUBBLE = (1 << 13), /**< Propagate the gestures to the parent*/ diff --git a/src/lv_api_map.h b/src/lv_api_map.h index 2f3c811e8..bdef5ffaa 100644 --- a/src/lv_api_map.h +++ b/src/lv_api_map.h @@ -19,9 +19,10 @@ extern "C" { * DEFINES *********************/ -#define LV_NO_TASK_READY LV_NO_TIMER_READY -#define LV_INDEV_STATE_REL LV_INDEV_STATE_RELEASED -#define LV_INDEV_STATE_PR LV_INDEV_STATE_PRESSED +#define LV_NO_TASK_READY LV_NO_TIMER_READY +#define LV_INDEV_STATE_REL LV_INDEV_STATE_RELEASED +#define LV_INDEV_STATE_PR LV_INDEV_STATE_PRESSED +#define LV_OBJ_FLAG_SNAPABLE LV_OBJ_FLAG_SNAPPABLE /*Fixed typo*/ /********************** * TYPEDEFS