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

ddlist and roller: fix to save the selected option by encoder

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2019-05-10 15:12:41 +02:00
parent 77d43069e0
commit 1489629b61
1 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/lv_objx/lv_ddlist.c
View File

@@ -791,6 +791,7 @@ static lv_res_t release_handler(lv_obj_t * ddlist)
/*Leave edit mode once a new item is selected*/ /*Leave edit mode once a new item is selected*/
lv_indev_t * indev = lv_indev_get_act(); lv_indev_t * indev = lv_indev_get_act();
if(lv_indev_get_type(indev) == LV_INDEV_TYPE_ENCODER) { if(lv_indev_get_type(indev) == LV_INDEV_TYPE_ENCODER) {
ext->sel_opt_id_ori = ext->sel_opt_id;
lv_group_t * g = lv_obj_get_group(ddlist); lv_group_t * g = lv_obj_get_group(ddlist);
if(lv_group_get_editing(g)) { if(lv_group_get_editing(g)) {
lv_group_set_editing(g, false); lv_group_set_editing(g, false);
@@ -820,10 +821,9 @@ static lv_res_t release_handler(lv_obj_t * ddlist)
} }
ext->sel_opt_id = new_opt; ext->sel_opt_id = new_opt;
ext->sel_opt_id_ori = ext->sel_opt_id;
} }
ext->sel_opt_id_ori = ext->sel_opt_id;
lv_res_t res = lv_event_send(ddlist, LV_EVENT_VALUE_CHANGED, &ext->sel_opt_id); lv_res_t res = lv_event_send(ddlist, LV_EVENT_VALUE_CHANGED, &ext->sel_opt_id);
if(res != LV_RES_OK) return res; if(res != LV_RES_OK) return res;
@@ -883,25 +883,26 @@ static void lv_ddlist_refr_size(lv_obj_t * ddlist, bool anim_en)
/*Force animation complete to fix highlight selection*/ /*Force animation complete to fix highlight selection*/
lv_ddlist_anim_finish(ddlist); lv_ddlist_anim_finish(ddlist);
} else { } else {
lv_anim_t a; /*Run the animation only if the the size will be different*/
a.var = ddlist; if(lv_obj_get_height(ddlist) != new_height) {
a.start = lv_obj_get_height(ddlist); lv_anim_t a;
a.end = new_height; a.var = ddlist;
a.exec_cb = (lv_anim_exec_cb_t)lv_ddlist_adjust_height; a.start = lv_obj_get_height(ddlist);
a.path_cb = lv_anim_path_linear; a.end = new_height;
a.ready_cb = lv_ddlist_anim_ready_cb; a.exec_cb = (lv_anim_exec_cb_t)lv_ddlist_adjust_height;
a.act_time = 0; a.path_cb = lv_anim_path_linear;
a.time = ext->anim_time; a.ready_cb = lv_ddlist_anim_ready_cb;
a.playback = 0; a.act_time = 0;
a.playback_pause = 0; a.time = ext->anim_time;
a.repeat = 0; a.playback = 0;
a.repeat_pause = 0; a.playback_pause = 0;
a.repeat = 0;
a.repeat_pause = 0;
ext->force_sel = 1; /*Keep the list item selected*/ ext->force_sel = 1; /*Keep the list item selected*/
lv_anim_create(&a); lv_anim_create(&a);
}
#endif #endif
} }
} }