From 71f00017af0cace8b81041a7a817058c690226a5 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Fri, 14 Jun 2019 06:56:54 +0200 Subject: [PATCH] remove LV_EVENT_SLECTED and use LV_EVENT_VALUE_CHANGED instead --- src/lv_core/lv_obj.h | 1 - src/lv_objx/lv_btnm.c | 8 ++++---- src/lv_objx/lv_ddlist.c | 2 ++ src/lv_objx/lv_kb.c | 2 +- src/lv_objx/lv_mbox.c | 4 ++-- src/lv_objx/lv_tabview.c | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/lv_core/lv_obj.h b/src/lv_core/lv_obj.h index 1eba9b6c2..a9de823cf 100644 --- a/src/lv_core/lv_obj.h +++ b/src/lv_core/lv_obj.h @@ -82,7 +82,6 @@ enum { LV_EVENT_DEFOCUSED, LV_EVENT_VALUE_CHANGED, LV_EVENT_INSERT, - LV_EVENT_SELECTED, LV_EVENT_REFRESH, LV_EVENT_APPLY, /*"Ok", "Apply" or similar specific button has clicked*/ LV_EVENT_CANCEL, /*"Close", "Cancel" or similar specific button has clicked*/ diff --git a/src/lv_objx/lv_btnm.c b/src/lv_objx/lv_btnm.c index 0ab5a95ed..26046ae15 100644 --- a/src/lv_objx/lv_btnm.c +++ b/src/lv_objx/lv_btnm.c @@ -718,7 +718,7 @@ static lv_res_t lv_btnm_signal(lv_obj_t * btnm, lv_signal_t sign, void * param) button_is_inactive(ext->ctrl_bits[ext->btn_id_act]) == false && button_is_hidden(ext->ctrl_bits[ext->btn_id_act]) == false) { uint32_t b = ext->btn_id_act; - res = lv_event_send(btnm, LV_EVENT_SELECTED, &b); + res = lv_event_send(btnm, LV_EVENT_VALUE_CHANGED, &b); } } } else if(sign == LV_SIGNAL_PRESSING) { @@ -734,7 +734,7 @@ static lv_res_t lv_btnm_signal(lv_obj_t * btnm, lv_signal_t sign, void * param) } if(btn_pr != LV_BTNM_BTN_NONE) { uint32_t b = ext->btn_id_act; - res = lv_event_send(btnm, LV_EVENT_SELECTED, &b); + res = lv_event_send(btnm, LV_EVENT_VALUE_CHANGED, &b); if(res == LV_RES_OK) { invalidate_button_area(btnm, btn_pr); } @@ -772,7 +772,7 @@ static lv_res_t lv_btnm_signal(lv_obj_t * btnm, lv_signal_t sign, void * param) button_is_inactive(ext->ctrl_bits[ext->btn_id_act]) == false && button_is_hidden(ext->ctrl_bits[ext->btn_id_act]) == false) { uint32_t b = ext->btn_id_act; - res = lv_event_send(btnm, LV_EVENT_SELECTED, &b); + res = lv_event_send(btnm, LV_EVENT_VALUE_CHANGED, &b); } } } else if(sign == LV_SIGNAL_LONG_PRESS_REP) { @@ -781,7 +781,7 @@ static lv_res_t lv_btnm_signal(lv_obj_t * btnm, lv_signal_t sign, void * param) button_is_inactive(ext->ctrl_bits[ext->btn_id_act]) == false && button_is_hidden(ext->ctrl_bits[ext->btn_id_act]) == false) { uint32_t b = ext->btn_id_act; - res = lv_event_send(btnm, LV_EVENT_SELECTED, &b); + res = lv_event_send(btnm, LV_EVENT_VALUE_CHANGED, &b); } } } else if(sign == LV_SIGNAL_PRESS_LOST || sign == LV_SIGNAL_DEFOCUS) { diff --git a/src/lv_objx/lv_ddlist.c b/src/lv_objx/lv_ddlist.c index 4ac1d7827..34e088c33 100644 --- a/src/lv_objx/lv_ddlist.c +++ b/src/lv_objx/lv_ddlist.c @@ -209,6 +209,8 @@ void lv_ddlist_set_selected(lv_obj_t * ddlist, uint16_t sel_opt) } else { lv_obj_invalidate(ddlist); } + + lv_event_send(ddlist, LV_EVENT_VALUE_CHANGED, &ext->sel_opt_id); } /** diff --git a/src/lv_objx/lv_kb.c b/src/lv_objx/lv_kb.c index 5c05c68a2..c3219976e 100644 --- a/src/lv_objx/lv_kb.c +++ b/src/lv_objx/lv_kb.c @@ -323,7 +323,7 @@ const lv_style_t * lv_kb_get_style(const lv_obj_t * kb, lv_kb_style_t type) */ void lv_kb_def_event_cb(lv_obj_t * kb, lv_event_t event) { - if(event != LV_EVENT_SELECTED && event != LV_EVENT_LONG_PRESSED_REPEAT) return; + if(event != LV_EVENT_VALUE_CHANGED && event != LV_EVENT_LONG_PRESSED_REPEAT) return; lv_kb_ext_t * ext = lv_obj_get_ext_attr(kb); uint16_t btn_id = lv_btnm_get_active_btn(kb); diff --git a/src/lv_objx/lv_mbox.c b/src/lv_objx/lv_mbox.c index 9c8db33df..c240b5918 100644 --- a/src/lv_objx/lv_mbox.c +++ b/src/lv_objx/lv_mbox.c @@ -451,7 +451,7 @@ static lv_res_t lv_mbox_signal(lv_obj_t * mbox, lv_signal_t sign, void * param) } else if(sign == LV_SIGNAL_RELEASED) { if(ext->btnm) { uint16_t btn_id = lv_btnm_get_active_btn(ext->btnm); - if(btn_id != LV_BTNM_BTN_NONE) lv_event_send(mbox, LV_EVENT_SELECTED, &btn_id); + if(btn_id != LV_BTNM_BTN_NONE) lv_event_send(mbox, LV_EVENT_VALUE_CHANGED, &btn_id); } } else if(sign == LV_SIGNAL_FOCUS || sign == LV_SIGNAL_DEFOCUS || sign == LV_SIGNAL_CONTROL || sign == LV_SIGNAL_GET_EDITABLE) { @@ -521,7 +521,7 @@ static void lv_mbox_close_ready_cb(lv_anim_t * a) static void lv_mbox_default_event_cb(lv_obj_t * mbox, lv_event_t event) { - if(event != LV_EVENT_SELECTED) return; + if(event != LV_EVENT_VALUE_CHANGED) return; uint16_t btn_id = lv_mbox_get_active_btn(mbox); if(btn_id == LV_BTNM_BTN_NONE) return; diff --git a/src/lv_objx/lv_tabview.c b/src/lv_objx/lv_tabview.c index 7653e1dfd..9e7de2976 100644 --- a/src/lv_objx/lv_tabview.c +++ b/src/lv_objx/lv_tabview.c @@ -338,7 +338,7 @@ void lv_tabview_set_tab_act(lv_obj_t * tabview, uint16_t id, lv_anim_enable_t an lv_res_t res = LV_RES_OK; if(id >= ext->tab_cnt) id = ext->tab_cnt - 1; - if(id != ext->tab_cur) res = lv_event_send(tabview, LV_EVENT_SELECTED, &id); + if(id != ext->tab_cur) res = lv_event_send(tabview, LV_EVENT_VALUE_CHANGED, &id); if(res != LV_RES_OK) return; lv_btnm_set_btn_ctrl(ext->btns, ext->tab_cur, LV_BTNM_CTRL_TGL_STATE, false);