fix(typo) rename LV_OBJ_FLAG_SNAPABLE to LV_OBJ_FLAG_SNAPPABLE
This commit is contained in:
@@ -33,7 +33,7 @@ void lv_example_scroll_2(void)
|
|||||||
lv_obj_t * label = lv_label_create(btn);
|
lv_obj_t * label = lv_label_create(btn);
|
||||||
if(i == 3) {
|
if(i == 3) {
|
||||||
lv_label_set_text_fmt(label, "Panel %d\nno snap", i);
|
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 {
|
} else {
|
||||||
lv_label_set_text_fmt(label, "Panel %d", i);
|
lv_label_set_text_fmt(label, "Panel %d", i);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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++) {
|
for(i = 0; i < lv_obj_get_child_cnt(obj); i++) {
|
||||||
lv_obj_t * child = lv_obj_get_child(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_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_child = 0;
|
||||||
lv_coord_t x_parent = 0;
|
lv_coord_t x_parent = 0;
|
||||||
switch(align) {
|
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++) {
|
for(i = 0; i < lv_obj_get_child_cnt(obj); i++) {
|
||||||
lv_obj_t * child = lv_obj_get_child(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_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_child = 0;
|
||||||
lv_coord_t y_parent = 0;
|
lv_coord_t y_parent = 0;
|
||||||
switch(align) {
|
switch(align) {
|
||||||
|
|||||||
@@ -369,7 +369,7 @@ static void lv_obj_constructor(const lv_obj_class_t * class_p, lv_obj_t * obj)
|
|||||||
|
|
||||||
/*Set attributes*/
|
/*Set attributes*/
|
||||||
obj->flags = LV_OBJ_FLAG_CLICKABLE;
|
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_PRESS_LOCK;
|
||||||
if(parent) obj->flags |= LV_OBJ_FLAG_SCROLL_CHAIN;
|
if(parent) obj->flags |= LV_OBJ_FLAG_SCROLL_CHAIN;
|
||||||
obj->flags |= LV_OBJ_FLAG_CLICK_FOCUSABLE;
|
obj->flags |= LV_OBJ_FLAG_CLICK_FOCUSABLE;
|
||||||
|
|||||||
@@ -97,7 +97,7 @@ enum {
|
|||||||
LV_OBJ_FLAG_SCROLL_ONE = (1 << 7), /**< Allow scrolling only one snapable children*/
|
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_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_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_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_EVENT_BUBBLE = (1 << 12), /**< Propagate the events to the parent too*/
|
||||||
LV_OBJ_FLAG_GESTURE_BUBBLE = (1 << 13), /**< Propagate the gestures to the parent*/
|
LV_OBJ_FLAG_GESTURE_BUBBLE = (1 << 13), /**< Propagate the gestures to the parent*/
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ extern "C" {
|
|||||||
#define LV_NO_TASK_READY LV_NO_TIMER_READY
|
#define LV_NO_TASK_READY LV_NO_TIMER_READY
|
||||||
#define LV_INDEV_STATE_REL LV_INDEV_STATE_RELEASED
|
#define LV_INDEV_STATE_REL LV_INDEV_STATE_RELEASED
|
||||||
#define LV_INDEV_STATE_PR LV_INDEV_STATE_PRESSED
|
#define LV_INDEV_STATE_PR LV_INDEV_STATE_PRESSED
|
||||||
|
#define LV_OBJ_FLAG_SNAPABLE LV_OBJ_FLAG_SNAPPABLE /*Fixed typo*/
|
||||||
|
|
||||||
/**********************
|
/**********************
|
||||||
* TYPEDEFS
|
* TYPEDEFS
|
||||||
|
|||||||
Reference in New Issue
Block a user