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

fix(roller): fix unexpected jump in infinite mode

Browse Source 
fixes #3132
This commit is contained in:
Gabor Kiss-Vamosi
2022-03-01 18:39:58 +01:00
parent 0a5c5465d2
commit 18f2d78728
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/widgets/lv_roller.c
View File

@@ -161,17 +161,20 @@ void lv_roller_set_selected(lv_obj_t * obj, uint16_t sel_opt, lv_anim_enable_t a
/*In infinite mode interpret the new ID relative to the currently visible "page"*/ /*In infinite mode interpret the new ID relative to the currently visible "page"*/
if(roller->mode == LV_ROLLER_MODE_INFINITE) { if(roller->mode == LV_ROLLER_MODE_INFINITE) {
int32_t sel_opt_signed = sel_opt; uint32_t real_option_cnt = roller->option_cnt / LV_ROLLER_INF_PAGES;
uint16_t page = roller->sel_opt_id / LV_ROLLER_INF_PAGES; uint16_t current_page = roller->sel_opt_id / real_option_cnt;
/*Set by the user to e.g. 0, 1, 2, 3...
/*`sel_opt` should be less than the number of options set by the user. *Upscale the value to the current page*/
*If it's more then probably it's a reference from not the first page if(sel_opt < real_option_cnt) {
*so normalize `sel_opt`*/ uint16_t act_opt = roller->sel_opt_id - current_page * real_option_cnt;
if(page != 0) { int32_t sel_opt_signed = sel_opt;
sel_opt_signed -= page * LV_ROLLER_INF_PAGES; /*Huge jump? Probably from last to first or first to last option.*/
if(LV_ABS((int16_t)act_opt - sel_opt) > real_option_cnt / 2) {
if(act_opt > sel_opt) sel_opt_signed += real_option_cnt;
else sel_opt_signed -= real_option_cnt;
}
sel_opt = sel_opt_signed + real_option_cnt * current_page;
} }
sel_opt = page * LV_ROLLER_INF_PAGES + sel_opt_signed;
} }
roller->sel_opt_id = sel_opt < roller->option_cnt ? sel_opt : roller->option_cnt - 1; roller->sel_opt_id = sel_opt < roller->option_cnt ? sel_opt : roller->option_cnt - 1;