Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-28 07:03:00 +08:00
Code Issues Projects Releases Wiki Activity

Lock out horizontal swiping while vertical scrolling is in progress

Browse Source
This commit is contained in:
Themba Dube 2019-03-22 21:38:05 -04:00
parent f0e423a71e
commit a8dc1afe2c
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lv_objx/lv_tabview.c
View File

@ -82,6 +82,7 @@ lv_obj_t * lv_tabview_create(lv_obj_t * par, const lv_obj_t * copy)
/*Initialize the allocated 'ext' */ /*Initialize the allocated 'ext' */
ext->drag_hor = 0; ext->drag_hor = 0;
ext->draging = 0; ext->draging = 0;
ext->scroll_ver = 0;
ext->slide_enable = 1; ext->slide_enable = 1;
ext->tab_cur = 0; ext->tab_cur = 0;
ext->point_last.x = 0; ext->point_last.x = 0;
@ -734,7 +735,7 @@ static void tabpage_pressing_handler(lv_obj_t * tabview, lv_obj_t * tabpage)
lv_coord_t y_diff = point_act.y - ext->point_last.y; lv_coord_t y_diff = point_act.y - ext->point_last.y;
if(x_diff >= LV_INDEV_DRAG_LIMIT || x_diff <= -LV_INDEV_DRAG_LIMIT) { if(!ext->scroll_ver && (x_diff >= LV_INDEV_DRAG_LIMIT || x_diff <= -LV_INDEV_DRAG_LIMIT)) {
ext->draging = 1; ext->draging = 1;
/*Check if the page is on the edge */ /*Check if the page is on the edge */
if((lv_page_on_edge(tabpage, LV_PAGE_EDGE_LEFT) && x_diff > 0) || if((lv_page_on_edge(tabpage, LV_PAGE_EDGE_LEFT) && x_diff > 0) ||
@ -752,6 +753,7 @@ static void tabpage_pressing_handler(lv_obj_t * tabview, lv_obj_t * tabpage)
} else if(y_diff >= LV_INDEV_DRAG_LIMIT || y_diff <= -LV_INDEV_DRAG_LIMIT) { } else if(y_diff >= LV_INDEV_DRAG_LIMIT || y_diff <= -LV_INDEV_DRAG_LIMIT) {
ext->drag_hor = 0; ext->drag_hor = 0;
ext->draging = 1; ext->draging = 1;
ext->scroll_ver = 1;
} else } else
ext->draging = 0; ext->draging = 0;
@ -780,6 +782,7 @@ static void tabpage_press_lost_handler(lv_obj_t * tabview, lv_obj_t * tabpage)
lv_tabview_ext_t * ext = lv_obj_get_ext_attr(tabview); lv_tabview_ext_t * ext = lv_obj_get_ext_attr(tabview);
ext->drag_hor = 0; ext->drag_hor = 0;
ext->draging = 0; ext->draging = 0;
ext->scroll_ver = 0;
lv_obj_set_drag(lv_page_get_scrl(tabpage), true); lv_obj_set_drag(lv_page_get_scrl(tabpage), true);

1
src/lv_objx/lv_tabview.h
View File

@ -64,6 +64,7 @@ typedef struct
uint8_t slide_enable :1; /*1: enable horizontal sliding by touch pad*/ uint8_t slide_enable :1; /*1: enable horizontal sliding by touch pad*/
uint8_t draging :1; uint8_t draging :1;
uint8_t drag_hor :1; uint8_t drag_hor :1;
uint8_t scroll_ver :1;
uint8_t btns_hide :1; uint8_t btns_hide :1;
lv_tabview_btns_pos_t btns_pos :1; lv_tabview_btns_pos_t btns_pos :1;
} lv_tabview_ext_t; } lv_tabview_ext_t;