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

Merge branch 'master' into dev-5.3

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2018-10-16 14:05:32 +02:00
parent c444d43fe8 7427e01b60
commit eab7a961df
13 changed files with 143 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lv_core/lv_group.c
View File

@@ -138,6 +138,7 @@ void lv_group_remove_obj(lv_obj_t * obj)
lv_ll_rem(&g->obj_ll, i); lv_ll_rem(&g->obj_ll, i);
lv_mem_free(i); lv_mem_free(i);
obj->group_p = NULL; obj->group_p = NULL;
break;
} }
} }
} }
@@ -153,6 +154,9 @@ void lv_group_focus_obj(lv_obj_t * obj)
if(g->frozen != 0) return; if(g->frozen != 0) return;
/*On defocus edit mode must be leaved*/
lv_group_set_editing(g, false);
lv_obj_t ** i; lv_obj_t ** i;
LL_READ(g->obj_ll, i) { LL_READ(g->obj_ll, i) {
if(*i == obj) { if(*i == obj) {
@@ -294,8 +298,15 @@ void lv_group_set_focus_cb(lv_group_t * group, lv_group_focus_cb_t focus_cb)
*/ */
void lv_group_set_editing(lv_group_t * group, bool edit) void lv_group_set_editing(lv_group_t * group, bool edit)
{ {
group->editing = edit ? 1 : 0; uint8_t en_val = edit ? 1 : 0;
if(en_val == group->editing) return; /*Do not set the same mode again*/
group->editing = en_val;
lv_obj_t * focused = lv_group_get_focused(group); lv_obj_t * focused = lv_group_get_focused(group);
if(focused) focused->signal_func(focused, LV_SIGNAL_FOCUS, NULL); /*Focus again to properly leave edit mode*/
lv_obj_invalidate(focused); lv_obj_invalidate(focused);
} }

20
lv_core/lv_indev.c
View File

@@ -384,11 +384,7 @@ static void indev_keypad_proc(lv_indev_t * i, lv_indev_data_t * data)
/* Edit mode is not used by KEYPAD devices. /* Edit mode is not used by KEYPAD devices.
* So leave edit mode if we are in it before focusing on the next/prev object*/ * So leave edit mode if we are in it before focusing on the next/prev object*/
if(data->key == LV_GROUP_KEY_NEXT || data->key == LV_GROUP_KEY_PREV) { if(data->key == LV_GROUP_KEY_NEXT || data->key == LV_GROUP_KEY_PREV) {
if(lv_group_get_editing(i->group)) { lv_group_set_editing(i->group, false);
lv_group_set_editing(i->group, false);
lv_obj_t * focused = lv_group_get_focused(i->group);
if(focused) focused->signal_func(focused, LV_SIGNAL_FOCUS, NULL); /*Focus again to properly leave edit mode*/
}
} }
if(data->key == LV_GROUP_KEY_NEXT) { if(data->key == LV_GROUP_KEY_NEXT) {
@@ -465,10 +461,7 @@ static void indev_encoder_proc(lv_indev_t * i, lv_indev_data_t * data)
if(focused) focused->signal_func(focused, LV_SIGNAL_GET_EDITABLE, &editable); if(focused) focused->signal_func(focused, LV_SIGNAL_GET_EDITABLE, &editable);
if(editable) { if(editable) {
i->group->editing = i->group->editing ? 0 : 1; lv_group_set_editing(i->group, lv_group_get_editing(i->group) ? false : true); /*Toggle edit mode on long press*/
if(focused) focused->signal_func(focused, LV_SIGNAL_FOCUS, NULL); /*Focus again. Some object do something on navigate->edit change*/
LV_LOG_INFO("Edit mode changed");
if(focused) lv_obj_invalidate(focused);
} }
/*If not editable then just send a long press signal*/ /*If not editable then just send a long press signal*/
else { else {
@@ -493,10 +486,7 @@ static void indev_encoder_proc(lv_indev_t * i, lv_indev_data_t * data)
} }
/*If the focused object is editable and now in navigate mode then enter edit mode*/ /*If the focused object is editable and now in navigate mode then enter edit mode*/
else if(editable && !i->group->editing && !i->proc.long_pr_sent) { else if(editable && !i->group->editing && !i->proc.long_pr_sent) {
i->group->editing = i->group->editing ? 0 : 1; lv_group_set_editing(i->group, lv_group_get_editing(i->group) ? false : true); /*Toggle edit mode on long press*/
if(focused) focused->signal_func(focused, LV_SIGNAL_FOCUS, NULL); /*Focus again. Some object do something on navigate->edit change*/
LV_LOG_INFO("Edit mode changed (edit)");
if(focused) lv_obj_invalidate(focused);
} }
if(i->proc.reset_query) return; /*The object might be deleted in `focus_cb` or due to any other user event*/ if(i->proc.reset_query) return; /*The object might be deleted in `focus_cb` or due to any other user event*/
@@ -690,13 +680,15 @@ static void indev_proc_release(lv_indev_proc_t * proc)
else { else {
proc->act_obj->signal_func(proc->act_obj, LV_SIGNAL_RELEASED, indev_act); proc->act_obj->signal_func(proc->act_obj, LV_SIGNAL_RELEASED, indev_act);
} }
if(proc->reset_query != 0) return;
/*Handle click focus*/ /*Handle click focus*/
#if USE_LV_GROUP #if USE_LV_GROUP
/*Edit mode is not used by POINTER devices. So leave edit mode if we are in it*/ /*Edit mode is not used by POINTER devices. So leave edit mode if we are in it*/
lv_group_t * act_g = lv_obj_get_group(proc->act_obj); lv_group_t * act_g = lv_obj_get_group(proc->act_obj);
if(lv_group_get_editing(act_g)) { if(lv_group_get_editing(act_g)) {
lv_group_set_editing(act_g, false); lv_group_set_editing(act_g, false);
proc->act_obj->signal_func(proc->act_obj, LV_SIGNAL_FOCUS, NULL); /*Focus again to properly leave edit mode*/
} }
/*Check, if the parent is in a group focus on it.*/ /*Check, if the parent is in a group focus on it.*/

1
lv_misc/lv_anim.c
View File

@@ -266,6 +266,7 @@ static bool anim_ready_handler(lv_anim_t * a)
void * p = a->var; void * p = a->var;
lv_ll_rem(&anim_ll, a); lv_ll_rem(&anim_ll, a);
lv_mem_free(a); lv_mem_free(a);
anim_list_changed = true;
/* Call the callback function at the end*/ /* Call the callback function at the end*/
/* Check if an animation is deleted in the cb function /* Check if an animation is deleted in the cb function

9
lv_misc/lv_task.c
View File

@@ -31,6 +31,7 @@ static bool lv_task_exec(lv_task_t * lv_task_p);
static lv_ll_t lv_task_ll; /*Linked list to store the lv_tasks*/ static lv_ll_t lv_task_ll; /*Linked list to store the lv_tasks*/
static bool lv_task_run = false; static bool lv_task_run = false;
static uint8_t idle_last = 0; static uint8_t idle_last = 0;
static bool task_deleted;
/********************** /**********************
* MACROS * MACROS
@@ -197,6 +198,8 @@ void lv_task_del(lv_task_t * lv_task_p)
lv_ll_rem(&lv_task_ll, lv_task_p); lv_ll_rem(&lv_task_ll, lv_task_p);
lv_mem_free(lv_task_p); lv_mem_free(lv_task_p);
task_deleted = true;
} }
/** /**
@@ -298,11 +301,13 @@ static bool lv_task_exec(lv_task_t * lv_task_p)
uint32_t elp = lv_tick_elaps(lv_task_p->last_run); uint32_t elp = lv_tick_elaps(lv_task_p->last_run);
if(elp >= lv_task_p->period) { if(elp >= lv_task_p->period) {
lv_task_p->last_run = lv_tick_get(); lv_task_p->last_run = lv_tick_get();
task_deleted = false;
lv_task_p->task(lv_task_p->param); lv_task_p->task(lv_task_p->param);
/*Delete if it was a one shot lv_task*/ /*Delete if it was a one shot lv_task*/
if(lv_task_p->once != 0) lv_task_del(lv_task_p); if(task_deleted == false) { /*The task might be deleted by itself as well*/
if(lv_task_p->once != 0) lv_task_del(lv_task_p);
}
exec = true; exec = true;
} }

62
lv_objx/lv_btnm.c
View File

@@ -541,7 +541,7 @@ static lv_res_t lv_btnm_signal(lv_obj_t * btnm, lv_signal_t sign, void * param)
if(txt_i != LV_BTNM_PR_NONE) { if(txt_i != LV_BTNM_PR_NONE) {
if(button_is_repeat_disabled(ext->map_p[txt_i]) == false && if(button_is_repeat_disabled(ext->map_p[txt_i]) == false &&
button_is_inactive(ext->map_p[txt_i]) == false) { button_is_inactive(ext->map_p[txt_i]) == false) {
ext->action(btnm, cut_ctrl_byte(ext->map_p[txt_i])); res = ext->action(btnm, cut_ctrl_byte(ext->map_p[txt_i]));
} }
} }
} }
@@ -549,39 +549,41 @@ static lv_res_t lv_btnm_signal(lv_obj_t * btnm, lv_signal_t sign, void * param)
if(ext->btn_id_pr != LV_BTNM_PR_NONE) { if(ext->btn_id_pr != LV_BTNM_PR_NONE) {
uint16_t txt_i = get_button_text(btnm, ext->btn_id_pr); uint16_t txt_i = get_button_text(btnm, ext->btn_id_pr);
if(button_is_inactive(ext->map_p[txt_i]) == false && txt_i != LV_BTNM_PR_NONE) { /*Ignore the inactive buttons anf click between the buttons*/ if(button_is_inactive(ext->map_p[txt_i]) == false && txt_i != LV_BTNM_PR_NONE) { /*Ignore the inactive buttons anf click between the buttons*/
if(ext->action)ext->action(btnm, cut_ctrl_byte(ext->map_p[txt_i])); if(ext->action) res = ext->action(btnm, cut_ctrl_byte(ext->map_p[txt_i]));
if(res == LV_RES_OK) {
/*Invalidate to old pressed area*/; /*Invalidate to old pressed area*/;
lv_obj_get_coords(btnm, &btnm_area); lv_obj_get_coords(btnm, &btnm_area);
lv_area_copy(&btn_area, &ext->button_areas[ext->btn_id_pr]); lv_area_copy(&btn_area, &ext->button_areas[ext->btn_id_pr]);
btn_area.x1 += btnm_area.x1; btn_area.x1 += btnm_area.x1;
btn_area.y1 += btnm_area.y1; btn_area.y1 += btnm_area.y1;
btn_area.x2 += btnm_area.x1; btn_area.x2 += btnm_area.x1;
btn_area.y2 += btnm_area.y1; btn_area.y2 += btnm_area.y1;
lv_inv_area(&btn_area); lv_inv_area(&btn_area);
if(ext->toggle != 0) { if(ext->toggle != 0) {
/*Invalidate to old toggled area*/; /*Invalidate to old toggled area*/;
lv_area_copy(&btn_area, &ext->button_areas[ext->btn_id_tgl]); lv_area_copy(&btn_area, &ext->button_areas[ext->btn_id_tgl]);
btn_area.x1 += btnm_area.x1; btn_area.x1 += btnm_area.x1;
btn_area.y1 += btnm_area.y1; btn_area.y1 += btnm_area.y1;
btn_area.x2 += btnm_area.x1; btn_area.x2 += btnm_area.x1;
btn_area.y2 += btnm_area.y1; btn_area.y2 += btnm_area.y1;
lv_inv_area(&btn_area); lv_inv_area(&btn_area);
ext->btn_id_tgl = ext->btn_id_pr; ext->btn_id_tgl = ext->btn_id_pr;
} }
#if USE_LV_GROUP #if USE_LV_GROUP
/*Leave the clicked button as pressed if this the focused object in a group*/ /*Leave the clicked button as pressed if this the focused object in a group*/
lv_group_t * g = lv_obj_get_group(btnm); lv_group_t * g = lv_obj_get_group(btnm);
if(lv_group_get_focused(g) != btnm) { if(lv_group_get_focused(g) != btnm) {
ext->btn_id_pr = LV_BTNM_PR_NONE; ext->btn_id_pr = LV_BTNM_PR_NONE;
} }
#else #else
ext->btn_id_pr = LV_BTNM_PR_NONE; ext->btn_id_pr = LV_BTNM_PR_NONE;
#endif #endif
}
} }
} }
} else if(sign == LV_SIGNAL_PRESS_LOST || sign == LV_SIGNAL_DEFOCUS) { } else if(sign == LV_SIGNAL_PRESS_LOST || sign == LV_SIGNAL_DEFOCUS) {
@@ -663,7 +665,7 @@ static lv_res_t lv_btnm_signal(lv_obj_t * btnm, lv_signal_t sign, void * param)
if(ext->action != NULL) { if(ext->action != NULL) {
uint16_t txt_i = get_button_text(btnm, ext->btn_id_pr); uint16_t txt_i = get_button_text(btnm, ext->btn_id_pr);
if(txt_i != LV_BTNM_PR_NONE) { if(txt_i != LV_BTNM_PR_NONE) {
ext->action(btnm, cut_ctrl_byte(ext->map_p[txt_i])); res = ext->action(btnm, cut_ctrl_byte(ext->map_p[txt_i]));
} }
} }
} }

26
lv_objx/lv_ddlist.c
View File

@@ -588,17 +588,19 @@ static lv_res_t lv_ddlist_signal(lv_obj_t * ddlist, lv_signal_t sign, void * par
if(ext->opened) { if(ext->opened) {
ext->sel_opt_id_ori = ext->sel_opt_id; ext->sel_opt_id_ori = ext->sel_opt_id;
ext->opened = 0; ext->opened = 0;
if(ext->action) ext->action(ddlist); if(ext->action) res = ext->action(ddlist);
#if USE_LV_GROUP #if USE_LV_GROUP
lv_group_t * g = lv_obj_get_group(ddlist); if(res == LV_RES_OK) {
bool editing = lv_group_get_editing(g); lv_group_t * g = lv_obj_get_group(ddlist);
if(editing) lv_group_set_editing(g, false); /*In edit mode go to navigate mode if an option is selected*/ bool editing = lv_group_get_editing(g);
if(editing) lv_group_set_editing(g, false); /*In edit mode go to navigate mode if an option is selected*/
}
#endif #endif
} else { } else {
ext->opened = 1; ext->opened = 1;
} }
lv_ddlist_refr_size(ddlist, true); if(res == LV_RES_OK) lv_ddlist_refr_size(ddlist, true);
} else if(c == LV_GROUP_KEY_ESC) { } else if(c == LV_GROUP_KEY_ESC) {
if(ext->opened) { if(ext->opened) {
ext->opened = 0; ext->opened = 0;
@@ -658,6 +660,7 @@ static lv_res_t lv_ddlist_scrl_signal(lv_obj_t * scrl, lv_signal_t sign, void *
static lv_res_t lv_ddlist_release_action(lv_obj_t * ddlist) static lv_res_t lv_ddlist_release_action(lv_obj_t * ddlist)
{ {
lv_ddlist_ext_t * ext = lv_obj_get_ext_attr(ddlist); lv_ddlist_ext_t * ext = lv_obj_get_ext_attr(ddlist);
lv_res_t res = LV_RES_OK;
if(ext->opened == 0) { /*Open the list*/ if(ext->opened == 0) { /*Open the list*/
ext->opened = 1; ext->opened = 1;
@@ -688,12 +691,13 @@ static lv_res_t lv_ddlist_release_action(lv_obj_t * ddlist)
ext->sel_opt_id = new_opt; ext->sel_opt_id = new_opt;
if(ext->action != NULL) { if(ext->action != NULL) {
ext->action(ddlist); res = ext->action(ddlist);
} }
} }
lv_ddlist_refr_size(ddlist, true);
return LV_RES_OK; if(res == LV_RES_OK) lv_ddlist_refr_size(ddlist, true);
return res;
} }
@@ -708,6 +712,9 @@ static void lv_ddlist_refr_size(lv_obj_t * ddlist, bool anim_en)
anim_en = false; anim_en = false;
#endif #endif
lv_ddlist_ext_t * ext = lv_obj_get_ext_attr(ddlist); lv_ddlist_ext_t * ext = lv_obj_get_ext_attr(ddlist);
if(ext->label == NULL) return; /*Probably the ddlist is being deleted if the label is NULL.*/
lv_style_t * style = lv_obj_get_style(ddlist); lv_style_t * style = lv_obj_get_style(ddlist);
lv_coord_t new_height; lv_coord_t new_height;
if(ext->opened) { /*Open the list*/ if(ext->opened) { /*Open the list*/
@@ -756,6 +763,9 @@ static void lv_ddlist_refr_size(lv_obj_t * ddlist, bool anim_en)
static void lv_ddlist_pos_current_option(lv_obj_t * ddlist) static void lv_ddlist_pos_current_option(lv_obj_t * ddlist)
{ {
lv_ddlist_ext_t * ext = lv_obj_get_ext_attr(ddlist); lv_ddlist_ext_t * ext = lv_obj_get_ext_attr(ddlist);
if(ext->label == NULL) return; /*Probably the ddlist is being deleted if the label is NULL.*/
lv_style_t * style = lv_obj_get_style(ddlist); lv_style_t * style = lv_obj_get_style(ddlist);
const lv_font_t * font = style->text.font; const lv_font_t * font = style->text.font;
lv_coord_t font_h = lv_font_get_height(font); lv_coord_t font_h = lv_font_get_height(font);

19
lv_objx/lv_kb.c
View File

@@ -25,7 +25,7 @@
* STATIC PROTOTYPES * STATIC PROTOTYPES
**********************/ **********************/
static lv_res_t lv_kb_signal(lv_obj_t * kb, lv_signal_t sign, void * param); static lv_res_t lv_kb_signal(lv_obj_t * kb, lv_signal_t sign, void * param);
static lv_res_t lv_app_kb_action(lv_obj_t * kb, const char * txt); static lv_res_t lv_kb_def_action(lv_obj_t * kb, const char * txt);
/********************** /**********************
* STATIC VARIABLES * STATIC VARIABLES
@@ -104,7 +104,7 @@ lv_obj_t * lv_kb_create(lv_obj_t * par, const lv_obj_t * copy)
if(copy == NULL) { if(copy == NULL) {
lv_obj_set_size(new_kb, LV_HOR_RES, LV_VER_RES / 2); lv_obj_set_size(new_kb, LV_HOR_RES, LV_VER_RES / 2);
lv_obj_align(new_kb, NULL, LV_ALIGN_IN_BOTTOM_MID, 0, 0); lv_obj_align(new_kb, NULL, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
lv_btnm_set_action(new_kb, lv_app_kb_action); lv_btnm_set_action(new_kb, lv_kb_def_action);
lv_btnm_set_map(new_kb, kb_map_lc); lv_btnm_set_map(new_kb, kb_map_lc);
/*Set the default styles*/ /*Set the default styles*/
@@ -390,9 +390,10 @@ static lv_res_t lv_kb_signal(lv_obj_t * kb, lv_signal_t sign, void * param)
* @param i the index of the released button from the current btnm map * @param i the index of the released button from the current btnm map
* @return LV_ACTION_RES_INV if the btnm is deleted else LV_ACTION_RES_OK * @return LV_ACTION_RES_INV if the btnm is deleted else LV_ACTION_RES_OK
*/ */
static lv_res_t lv_app_kb_action(lv_obj_t * kb, const char * txt) static lv_res_t lv_kb_def_action(lv_obj_t * kb, const char * txt)
{ {
lv_kb_ext_t * ext = lv_obj_get_ext_attr(kb); lv_kb_ext_t * ext = lv_obj_get_ext_attr(kb);
lv_res_t res = LV_RES_OK;
/*Do the corresponding action according to the text of the button*/ /*Do the corresponding action according to the text of the button*/
if(strcmp(txt, "abc") == 0) { if(strcmp(txt, "abc") == 0) {
@@ -405,22 +406,24 @@ static lv_res_t lv_app_kb_action(lv_obj_t * kb, const char * txt)
lv_btnm_set_map(kb, kb_map_spec); lv_btnm_set_map(kb, kb_map_spec);
return LV_RES_OK; return LV_RES_OK;
} else if(strcmp(txt, SYMBOL_CLOSE) == 0) { } else if(strcmp(txt, SYMBOL_CLOSE) == 0) {
if(ext->hide_action) ext->hide_action(kb); if(ext->hide_action) res = ext->hide_action(kb);
else { else {
lv_kb_set_ta(kb, NULL); /*De-assign the text area to hide it cursor if needed*/ lv_kb_set_ta(kb, NULL); /*De-assign the text area to hide it cursor if needed*/
lv_obj_del(kb); lv_obj_del(kb);
} }
return LV_RES_INV; return LV_RES_INV;
} else if(strcmp(txt, SYMBOL_OK) == 0) { } else if(strcmp(txt, SYMBOL_OK) == 0) {
if(ext->ok_action) ext->ok_action(kb); if(ext->ok_action) res = ext->ok_action(kb);
else { else {
lv_kb_set_ta(kb, NULL); /*De-assign the text area to hide it cursor if needed*/ lv_kb_set_ta(kb, NULL); /*De-assign the text area to hide it cursor if needed*/
lv_obj_del(kb); res = lv_obj_del(kb);
} }
return LV_RES_INV;
} }
if(ext->ta == NULL) return LV_RES_OK; if(res != LV_RES_OK) return res; /*The keyboard might be deleted in the actions*/
/*Add the characters to the text area if set*/
if(ext->ta == NULL) return res;
if(strcmp(txt, "Enter") == 0)lv_ta_add_char(ext->ta, '\n'); if(strcmp(txt, "Enter") == 0)lv_ta_add_char(ext->ta, '\n');
else if(strcmp(txt, SYMBOL_LEFT) == 0) lv_ta_cursor_left(ext->ta); else if(strcmp(txt, SYMBOL_LEFT) == 0) lv_ta_cursor_left(ext->ta);

8
lv_objx/lv_list.c
View File

@@ -767,8 +767,14 @@ static lv_res_t lv_list_btn_signal(lv_obj_t * btn, lv_signal_t sign, void * para
last_clicked_btn = btn; last_clicked_btn = btn;
} }
#endif if(sign == LV_SIGNAL_CLEANUP) {
lv_obj_t * list = lv_obj_get_parent(lv_obj_get_parent(btn));
lv_obj_t * sel = lv_list_get_btn_selected(list);
if(sel == btn) lv_list_set_btn_selected(list, lv_list_get_next_btn(list, btn));
}
#endif
return res; return res;
} }

13
lv_objx/lv_page.c
View File

@@ -381,6 +381,8 @@ void lv_page_glue_obj(lv_obj_t * obj, bool glue)
void lv_page_focus(lv_obj_t * page, const lv_obj_t * obj, uint16_t anim_time) void lv_page_focus(lv_obj_t * page, const lv_obj_t * obj, uint16_t anim_time)
{ {
lv_page_ext_t * ext = lv_obj_get_ext_attr(page);
#if USE_LV_ANIMATION == 0 #if USE_LV_ANIMATION == 0
anim_time = 0; anim_time = 0;
#else #else
@@ -388,9 +390,10 @@ void lv_page_focus(lv_obj_t * page, const lv_obj_t * obj, uint16_t anim_time)
* because it can overide the current changes*/ * because it can overide the current changes*/
lv_anim_del(page, (lv_anim_fp_t)lv_obj_set_y); lv_anim_del(page, (lv_anim_fp_t)lv_obj_set_y);
lv_anim_del(page, (lv_anim_fp_t)lv_obj_set_pos); lv_anim_del(page, (lv_anim_fp_t)lv_obj_set_pos);
lv_anim_del(ext->scrl, (lv_anim_fp_t)lv_obj_set_y);
lv_anim_del(ext->scrl, (lv_anim_fp_t)lv_obj_set_pos);
#endif #endif
lv_page_ext_t * ext = lv_obj_get_ext_attr(page);
lv_style_t * style = lv_page_get_style(page, LV_PAGE_STYLE_BG); lv_style_t * style = lv_page_get_style(page, LV_PAGE_STYLE_BG);
lv_style_t * style_scrl = lv_page_get_style(page, LV_PAGE_STYLE_SCRL); lv_style_t * style_scrl = lv_page_get_style(page, LV_PAGE_STYLE_SCRL);
@@ -673,12 +676,12 @@ static lv_res_t lv_page_signal(lv_obj_t * page, lv_signal_t sign, void * param)
} }
} else if(sign == LV_SIGNAL_PRESSED) { } else if(sign == LV_SIGNAL_PRESSED) {
if(ext->pr_action != NULL) { if(ext->pr_action != NULL) {
ext->pr_action(page); res = ext->pr_action(page);
} }
} else if(sign == LV_SIGNAL_RELEASED) { } else if(sign == LV_SIGNAL_RELEASED) {
if(lv_indev_is_dragging(lv_indev_get_act()) == false) { if(lv_indev_is_dragging(lv_indev_get_act()) == false) {
if(ext->rel_action != NULL) { if(ext->rel_action != NULL) {
ext->rel_action(page); res = ext->rel_action(page);
} }
} }
} else if(sign == LV_SIGNAL_REFR_EXT_SIZE) { } else if(sign == LV_SIGNAL_REFR_EXT_SIZE) {
@@ -817,12 +820,12 @@ static lv_res_t lv_page_scrollable_signal(lv_obj_t * scrl, lv_signal_t sign, voi
} }
} else if(sign == LV_SIGNAL_PRESSED) { } else if(sign == LV_SIGNAL_PRESSED) {
if(page_ext->pr_action != NULL) { if(page_ext->pr_action != NULL) {
page_ext->pr_action(page); res = page_ext->pr_action(page);
} }
} else if(sign == LV_SIGNAL_RELEASED) { } else if(sign == LV_SIGNAL_RELEASED) {
if(lv_indev_is_dragging(lv_indev_get_act()) == false) { if(lv_indev_is_dragging(lv_indev_get_act()) == false) {
if(page_ext->rel_action != NULL) { if(page_ext->rel_action != NULL) {
page_ext->rel_action(page); res = page_ext->rel_action(page);
} }
} }
} }

20
lv_objx/lv_roller.c
View File

@@ -359,12 +359,14 @@ static lv_res_t lv_roller_signal(lv_obj_t * roller, lv_signal_t sign, void * par
} }
} else if(c == LV_GROUP_KEY_ENTER) { } else if(c == LV_GROUP_KEY_ENTER) {
ext->ddlist.sel_opt_id_ori = ext->ddlist.sel_opt_id; /*Set the entered value as default*/ ext->ddlist.sel_opt_id_ori = ext->ddlist.sel_opt_id; /*Set the entered value as default*/
if(ext->ddlist.action) ext->ddlist.action(roller); if(ext->ddlist.action) res = ext->ddlist.action(roller);
#if USE_LV_GROUP #if USE_LV_GROUP
lv_group_t * g = lv_obj_get_group(roller); if(res == LV_RES_OK) {
bool editing = lv_group_get_editing(g); lv_group_t * g = lv_obj_get_group(roller);
bool editing = lv_group_get_editing(g);
if(editing) lv_group_set_editing(g, false); /*In edit mode go to navigate mode if an option is selected*/ if(editing) lv_group_set_editing(g, false); /*In edit mode go to navigate mode if an option is selected*/
}
#endif #endif
} }
} else if(sign == LV_SIGNAL_GET_TYPE) { } else if(sign == LV_SIGNAL_GET_TYPE) {
@@ -414,7 +416,7 @@ static lv_res_t lv_roller_scrl_signal(lv_obj_t * roller_scrl, lv_signal_t sign,
if(id < 0) id = 0; if(id < 0) id = 0;
if(id >= ext->ddlist.option_cnt) id = ext->ddlist.option_cnt - 1; if(id >= ext->ddlist.option_cnt) id = ext->ddlist.option_cnt - 1;
ext->ddlist.sel_opt_id = id; ext->ddlist.sel_opt_id = id;
if(ext->ddlist.action) ext->ddlist.action(roller); if(ext->ddlist.action) res = ext->ddlist.action(roller);
} else if(sign == LV_SIGNAL_RELEASED) { } else if(sign == LV_SIGNAL_RELEASED) {
/*If picked an option by clicking then set it*/ /*If picked an option by clicking then set it*/
if(!lv_indev_is_dragging(indev)) { if(!lv_indev_is_dragging(indev)) {
@@ -425,12 +427,12 @@ static lv_res_t lv_roller_scrl_signal(lv_obj_t * roller_scrl, lv_signal_t sign,
if(id < 0) id = 0; if(id < 0) id = 0;
if(id >= ext->ddlist.option_cnt) id = ext->ddlist.option_cnt - 1; if(id >= ext->ddlist.option_cnt) id = ext->ddlist.option_cnt - 1;
ext->ddlist.sel_opt_id = id; ext->ddlist.sel_opt_id = id;
if(ext->ddlist.action) ext->ddlist.action(roller); if(ext->ddlist.action) res = ext->ddlist.action(roller);
} }
} }
/*Position the scrollable according to the new selected option*/ /*Position the scrollable according to the new selected option*/
if(id != -1) { if(id != -1 && res == LV_RES_OK) {
refr_position(roller, true); refr_position(roller, true);
} }
@@ -503,8 +505,10 @@ static void refr_position(lv_obj_t * roller, bool anim_en)
#if USE_LV_ANIMATION == 0 #if USE_LV_ANIMATION == 0
anim_en = false; anim_en = false;
#endif #endif
lv_obj_t * roller_scrl = lv_page_get_scrl(roller);
lv_roller_ext_t * ext = lv_obj_get_ext_attr(roller); lv_roller_ext_t * ext = lv_obj_get_ext_attr(roller);
if(ext->ddlist.label == NULL) return; /*Probably the roller is being deleted if the label is NULL.*/
lv_obj_t * roller_scrl = lv_page_get_scrl(roller);
lv_style_t * style_label = lv_obj_get_style(ext->ddlist.label); lv_style_t * style_label = lv_obj_get_style(ext->ddlist.label);
const lv_font_t * font = style_label->text.font; const lv_font_t * font = style_label->text.font;
lv_coord_t font_h = lv_font_get_height(font); lv_coord_t font_h = lv_font_get_height(font);

8
lv_objx/lv_slider.c
View File

@@ -455,13 +455,13 @@ static lv_res_t lv_slider_signal(lv_obj_t * slider, lv_signal_t sign, void * par
if(tmp != ext->drag_value) { if(tmp != ext->drag_value) {
ext->drag_value = tmp; ext->drag_value = tmp;
if(ext->action != NULL) ext->action(slider);
lv_obj_invalidate(slider); lv_obj_invalidate(slider);
if(ext->action != NULL) res = ext->action(slider);
} }
} else if(sign == LV_SIGNAL_RELEASED || sign == LV_SIGNAL_PRESS_LOST) { } else if(sign == LV_SIGNAL_RELEASED || sign == LV_SIGNAL_PRESS_LOST) {
lv_slider_set_value(slider, ext->drag_value); lv_slider_set_value(slider, ext->drag_value);
ext->drag_value = LV_SLIDER_NOT_PRESSED; ext->drag_value = LV_SLIDER_NOT_PRESSED;
if(ext->action != NULL) ext->action(slider); if(ext->action != NULL) res = ext->action(slider);
} else if(sign == LV_SIGNAL_CORD_CHG) { } else if(sign == LV_SIGNAL_CORD_CHG) {
/* The knob size depends on slider size. /* The knob size depends on slider size.
* During the drawing method the ext. size is used by the knob so refresh the ext. size.*/ * During the drawing method the ext. size is used by the knob so refresh the ext. size.*/
@@ -498,10 +498,10 @@ static lv_res_t lv_slider_signal(lv_obj_t * slider, lv_signal_t sign, void * par
#endif #endif
if(c == LV_GROUP_KEY_RIGHT || c == LV_GROUP_KEY_UP) { if(c == LV_GROUP_KEY_RIGHT || c == LV_GROUP_KEY_UP) {
lv_slider_set_value(slider, lv_slider_get_value(slider) + 1); lv_slider_set_value(slider, lv_slider_get_value(slider) + 1);
if(ext->action != NULL) ext->action(slider); if(ext->action != NULL) res = ext->action(slider);
} else if(c == LV_GROUP_KEY_LEFT || c == LV_GROUP_KEY_DOWN) { } else if(c == LV_GROUP_KEY_LEFT || c == LV_GROUP_KEY_DOWN) {
lv_slider_set_value(slider, lv_slider_get_value(slider) - 1); lv_slider_set_value(slider, lv_slider_get_value(slider) - 1);
if(ext->action != NULL) ext->action(slider); if(ext->action != NULL) res = ext->action(slider);
} }
} else if(sign == LV_SIGNAL_GET_EDITABLE) { } else if(sign == LV_SIGNAL_GET_EDITABLE) {
bool * editable = (bool *)param; bool * editable = (bool *)param;

13
lv_objx/lv_sw.c
View File

@@ -243,9 +243,10 @@ static lv_res_t lv_sw_signal(lv_obj_t * sw, lv_signal_t sign, void * param)
if(lv_sw_get_state(sw)) lv_slider_set_style(sw, LV_SLIDER_STYLE_KNOB, ext->style_knob_on); if(lv_sw_get_state(sw)) lv_slider_set_style(sw, LV_SLIDER_STYLE_KNOB, ext->style_knob_on);
else lv_slider_set_style(sw, LV_SLIDER_STYLE_KNOB, ext->style_knob_off); else lv_slider_set_style(sw, LV_SLIDER_STYLE_KNOB, ext->style_knob_off);
if(slider_action != NULL) slider_action(sw);
ext->changed = 0; ext->changed = 0;
if(slider_action != NULL) res = slider_action(sw);
} else if(sign == LV_SIGNAL_CONTROLL) { } else if(sign == LV_SIGNAL_CONTROLL) {
char c = *((char *)param); char c = *((char *)param);
@@ -253,13 +254,13 @@ static lv_res_t lv_sw_signal(lv_obj_t * sw, lv_signal_t sign, void * param)
if(old_val) lv_sw_off(sw); if(old_val) lv_sw_off(sw);
else lv_sw_on(sw); else lv_sw_on(sw);
if(slider_action) slider_action(sw); if(slider_action) res = slider_action(sw);
} else if(c == LV_GROUP_KEY_UP || c == LV_GROUP_KEY_RIGHT) { } else if(c == LV_GROUP_KEY_UP || c == LV_GROUP_KEY_RIGHT) {
lv_sw_on(sw); lv_sw_on(sw);
if(slider_action) slider_action(sw); if(slider_action) res = slider_action(sw);
} else if(c == LV_GROUP_KEY_DOWN || c == LV_GROUP_KEY_LEFT) { } else if(c == LV_GROUP_KEY_DOWN || c == LV_GROUP_KEY_LEFT) {
lv_sw_off(sw); lv_sw_off(sw);
if(slider_action) slider_action(sw); if(slider_action) res = slider_action(sw);
} }
} else if(sign == LV_SIGNAL_GET_EDITABLE) { } else if(sign == LV_SIGNAL_GET_EDITABLE) {
bool * editable = (bool *)param; bool * editable = (bool *)param;
@@ -274,7 +275,7 @@ static lv_res_t lv_sw_signal(lv_obj_t * sw, lv_signal_t sign, void * param)
} }
/*Restore the callback*/ /*Restore the callback*/
ext->slider.action = slider_action; if(res == LV_RES_OK) ext->slider.action = slider_action;
return res; return res;
} }

18
lv_objx/lv_tabview.c
View File

@@ -577,9 +577,27 @@ static lv_res_t lv_tabview_signal(lv_obj_t * tabview, lv_signal_t sign, void * p
tabview_realign(tabview); tabview_realign(tabview);
} }
} else if(sign == LV_SIGNAL_FOCUS || sign == LV_SIGNAL_DEFOCUS || sign == LV_SIGNAL_CONTROLL) { } else if(sign == LV_SIGNAL_FOCUS || sign == LV_SIGNAL_DEFOCUS || sign == LV_SIGNAL_CONTROLL) {
/* The button matrix is not in a group (the tab view is in it) but it should handle the group signals.
* So propagate the related signals to the button matrix manually*/
if(ext->btns) { if(ext->btns) {
ext->btns->signal_func(ext->btns, sign, param); ext->btns->signal_func(ext->btns, sign, param);
} }
if(sign == LV_SIGNAL_FOCUS) {
lv_hal_indev_type_t indev_type = lv_indev_get_type(lv_indev_get_act());
/*With ENCODER select the first button only in edit mode*/
if(indev_type == LV_INDEV_TYPE_ENCODER) {
lv_group_t * g = lv_obj_get_group(tabview);
if(lv_group_get_editing(g)) {
lv_btnm_ext_t * btnm_ext = lv_obj_get_ext_attr(ext->btns);
btnm_ext->btn_id_pr = 0;
lv_obj_invalidate(ext->btns);
}
} else {
lv_btnm_ext_t * btnm_ext = lv_obj_get_ext_attr(ext->btns);
btnm_ext->btn_id_pr = 0;
lv_obj_invalidate(ext->btns);
}
}
} else if(sign == LV_SIGNAL_GET_EDITABLE) { } else if(sign == LV_SIGNAL_GET_EDITABLE) {
bool * editable = (bool *)param; bool * editable = (bool *)param;
*editable = true; *editable = true;