github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #1401: wrong roller opt selected with pointer-based input

Browse Source
This commit is contained in:
embeddedt
2020-03-05 10:06:48 -05:00
committed by GitHub
parent 3dc8b9ab0d
commit ffdf2ed542
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/lv_widgets/lv_roller.c
View File

@@ -756,9 +756,11 @@ static lv_res_t release_handler(lv_obj_t * roller)
lv_obj_t * label = get_label(roller);
/*Search the clicked option (For KEYPAD and ENCODER the new value should be already set)*/
uint16_t new_opt = 0;
if(lv_indev_get_type(indev) == LV_INDEV_TYPE_POINTER || lv_indev_get_type(indev) == LV_INDEV_TYPE_BUTTON) {
/*Search the clicked option (For KEYPAD and ENCODER the new value should be already set)*/
uint16_t new_opt = 0;
lv_point_t p;
lv_indev_get_point(indev, &p);
p.y -= label->coords.y1;
@@ -778,10 +780,9 @@ static lv_res_t release_handler(lv_obj_t * roller)
if(letter == '\n' && i_prev != letter_i) new_opt++;
i_prev = i;
}
lv_roller_set_selected(roller, new_opt, LV_ANIM_ON);
}
lv_roller_set_selected(roller, new_opt, LV_ANIM_ON);
uint32_t id = ext->sel_opt_id; /*Just to use uint32_t in event data*/
lv_res_t res = lv_event_send(roller, LV_EVENT_VALUE_CHANGED, &id);
return res;