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

fix(btnmatrix): ignore pressing while scrolling

Browse Source 
related to #4301
This commit is contained in:
Gabor Kiss-Vamosi 2023-06-26 09:46:30 +02:00
parent 7ca3ae661b
commit b1142ac7b1
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/widgets/btnmatrix/lv_btnmatrix.c
View File

@ -444,10 +444,19 @@ static void lv_btnmatrix_event(const lv_obj_class_t * class_p, lv_event_t * e)
} }
} }
else if(code == LV_EVENT_PRESSING) { else if(code == LV_EVENT_PRESSING) {
lv_indev_t * indev = lv_indev_get_act();
/*Ignore while scrolling*/
if(lv_indev_get_scroll_obj(indev)) {
if(btnm->btn_id_sel != LV_BTNMATRIX_BTN_NONE) {
invalidate_button_area(obj, btnm->btn_id_sel);
btnm->btn_id_sel = LV_BTNMATRIX_BTN_NONE;
invalidate_button_area(obj, btnm->btn_id_sel);
}
return;
}
void * param = lv_event_get_param(e); void * param = lv_event_get_param(e);
uint16_t btn_pr = LV_BTNMATRIX_BTN_NONE; uint16_t btn_pr = LV_BTNMATRIX_BTN_NONE;
/*Search the pressed area*/ /*Search the pressed area*/
lv_indev_t * indev = lv_indev_get_act();
lv_indev_type_t indev_type = lv_indev_get_type(indev); lv_indev_type_t indev_type = lv_indev_get_type(indev);
if(indev_type == LV_INDEV_TYPE_ENCODER || indev_type == LV_INDEV_TYPE_KEYPAD) return; if(indev_type == LV_INDEV_TYPE_ENCODER || indev_type == LV_INDEV_TYPE_KEYPAD) return;