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): keep the selected button even on release

Browse Source 
fixes: #2858
This commit is contained in:
Gabor Kiss-Vamosi 2021-12-07 15:38:01 +01:00
parent 559c2cdc9e
commit d47cd1d7fe
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/lv_indev.c
View File

@ -349,7 +349,7 @@ static void indev_pointer_proc(lv_indev_t * i, lv_indev_data_t * data)
if(data->point.x >= lv_disp_get_hor_res(i->driver->disp)) LV_LOG_WARN("X is %d which is greater than hor. res", if(data->point.x >= lv_disp_get_hor_res(i->driver->disp)) LV_LOG_WARN("X is %d which is greater than hor. res",
data->point.x); data->point.x);
if(data->point.y < 0) LV_LOG_WARN("Y is %d which is smaller than zero", data->point.y); if(data->point.y < 0) LV_LOG_WARN("Y is %d which is smaller than zero", data->point.y);
if(data->point.y >= lv_disp_get_ver_res(i->driver->disp)) LV_LOG_WARN("Y is %d which is greater than hor. res", if(data->point.y >= lv_disp_get_ver_res(i->driver->disp)) LV_LOG_WARN("Y is %d which is greater than ver. res",
data->point.y); data->point.y);
/*Move the cursor if set and moved*/ /*Move the cursor if set and moved*/

4
src/widgets/lv_btnmatrix.c
View File

@ -506,10 +506,6 @@ static void lv_btnmatrix_event(const lv_obj_class_t * class_p, lv_event_t * e)
/*Invalidate to old pressed area*/; /*Invalidate to old pressed area*/;
invalidate_button_area(obj, btnm->btn_id_sel); invalidate_button_area(obj, btnm->btn_id_sel);
lv_indev_type_t indev_type = lv_indev_get_type(lv_indev_get_act());
if(indev_type == LV_INDEV_TYPE_POINTER || indev_type == LV_INDEV_TYPE_BUTTON) {
btnm->btn_id_sel = LV_BTNMATRIX_BTN_NONE;
}
} }
else if(code == LV_EVENT_LONG_PRESSED_REPEAT) { else if(code == LV_EVENT_LONG_PRESSED_REPEAT) {
if(btnm->btn_id_sel != LV_BTNMATRIX_BTN_NONE) { if(btnm->btn_id_sel != LV_BTNMATRIX_BTN_NONE) {