Mirrors_UI_SDK/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2026-06-01 00:51:49 +08:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

fix(group): do not prefer KEYPAd and ENCODER indevs

Browse Source 
fixes #4052
This commit is contained in:
Gabor Kiss-Vamosi
2023-04-12 18:59:14 +02:00
parent 690b1bc1c4
commit d6cc2ff76f
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/lv_group.c
+3 -10
View File
@@ -466,7 +466,7 @@ static bool focus_next_core(lv_group_t * group, void * (*begin)(const lv_ll_t *)
} }
/** /**
* Find an indev preferably with KEYPAD or ENCOEDR type that uses the given group. * Find an indev preferably with POINTER type (because it's the most generic) that uses the given group.
* In other words, find an indev, that is related to the given group. * In other words, find an indev, that is related to the given group.
* In the worst case simply return the latest indev * In the worst case simply return the latest indev
* @param g a group the find in the indevs * @param g a group the find in the indevs
@@ -474,23 +474,16 @@ static bool focus_next_core(lv_group_t * group, void * (*begin)(const lv_ll_t *)
*/ */
static lv_indev_t * get_indev(const lv_group_t * g) static lv_indev_t * get_indev(const lv_group_t * g)
{ {
lv_indev_t * indev_encoder = NULL;
lv_indev_t * indev_group = NULL;
lv_indev_t * indev = lv_indev_get_next(NULL); lv_indev_t * indev = lv_indev_get_next(NULL);
while(indev) { while(indev) {
lv_indev_type_t indev_type = lv_indev_get_type(indev); lv_indev_type_t indev_type = lv_indev_get_type(indev);
if(lv_indev_get_group(indev) == g) { if(lv_indev_get_group(indev) == g) {
/*Prefer KEYPAD*/ /*Prefer POINTER*/
if(indev_type == LV_INDEV_TYPE_KEYPAD) return indev; if(indev_type == LV_INDEV_TYPE_POINTER) return indev;
if(indev_type == LV_INDEV_TYPE_ENCODER) indev_encoder = indev;
indev_group = indev;
} }
indev = lv_indev_get_next(indev); indev = lv_indev_get_next(indev);
} }
if(indev_encoder) return indev_encoder;
if(indev_group) return indev_group;
/*In lack of a better option use the first input device. (It can be NULL if there is no input device)*/ /*In lack of a better option use the first input device. (It can be NULL if there is no input device)*/
return lv_indev_get_next(NULL); return lv_indev_get_next(NULL);
} }