Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-14 06:42:58 +08:00
Code Issues Projects Releases Wiki Activity

Call lv_obj_set_pos if both drag directions are enabled

Browse Source
This commit is contained in:
Themba Dube 2019-04-08 08:38:25 -04:00
parent 2b0e378c73
commit 0c3a18e1fe
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lv_core/lv_indev.c
View File

@ -1056,10 +1056,11 @@ static void indev_drag(lv_indev_proc_t * state)
lv_coord_t act_x = lv_obj_get_x(drag_obj);
lv_coord_t act_y = lv_obj_get_y(drag_obj);
if(allowed_dirs & LV_DRAG_DIR_HOR)
if(allowed_dirs == LV_DRAG_DIR_ALL)
lv_obj_set_pos(drag_obj, act_x + state->types.pointer.vect.x, act_y + state->types.pointer.vect.y);
else if(allowed_dirs & LV_DRAG_DIR_HOR)
lv_obj_set_x(drag_obj, act_x + state->types.pointer.vect.x);
if(allowed_dirs & LV_DRAG_DIR_VER)
else if(allowed_dirs & LV_DRAG_DIR_VER)
lv_obj_set_y(drag_obj, act_y + state->types.pointer.vect.y);
/*Set the drag in progress flag*/
@ -1115,9 +1116,12 @@ static void indev_drag_throw(lv_indev_proc_t * proc)
lv_coord_t act_x = lv_obj_get_x(drag_obj) + proc->types.pointer.drag_throw_vect.x;
lv_coord_t act_y = lv_obj_get_y(drag_obj) + proc->types.pointer.drag_throw_vect.y;
if(allowed_dirs & LV_DRAG_DIR_HOR) lv_obj_set_x(drag_obj, act_x);
if(allowed_dirs & LV_DRAG_DIR_VER) lv_obj_set_y(drag_obj, act_y);
if(allowed_dirs == LV_DRAG_DIR_ALL)
lv_obj_set_pos(drag_obj, act_x, act_y);
else if(allowed_dirs & LV_DRAG_DIR_HOR)
lv_obj_set_x(drag_obj, act_x);
else if(allowed_dirs & LV_DRAG_DIR_VER)
lv_obj_set_y(drag_obj, act_y);
lv_area_t coord_new;
lv_obj_get_coords(drag_obj, &coord_new);

3
src/lv_core/lv_obj.h
View File

@ -171,7 +171,8 @@ typedef struct
enum {
LV_DRAG_DIR_HOR = 0x1,
LV_DRAG_DIR_VER = 0x2
LV_DRAG_DIR_VER = 0x2,
LV_DRAG_DIR_ALL = 0x3, /* Should be the bitwise OR of the above */
};
typedef uint8_t lv_drag_dir_t;