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

refactor(event): use lv_event_get_orignal_target instead of current_target

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2023-03-06 12:47:18 +01:00
parent 1d6ea3af51
commit 680d6d1a7d
41 changed files with 65 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
demos/keypad_encoder/lv_demo_keypad_encoder.c
View File

@@ -179,7 +179,7 @@ static void msgbox_create(void)
static void msgbox_event_cb(lv_event_t * e)
{
lv_event_code_t code = lv_event_get_code(e);
lv_obj_t * msgbox = lv_event_get_current_target(e);
lv_obj_t * msgbox = lv_event_get_target(e);
if(code == LV_EVENT_VALUE_CHANGED) {
const char * txt = lv_msgbox_get_active_btn_text(msgbox);

2
demos/keypad_encoder/lv_demo_keypad_encoder.py
View File

@@ -118,7 +118,7 @@ class KeyboardEncoder:
def msgbox_event_cb(self,e):
code = e.get_code();
msgbox = e.get_current_target()
msgbox = e.get_target()
if code == lv.EVENT.VALUE_CHANGED:
txt = msgbox.get_active_btn_text()

2
demos/widgets/lv_demo_widgets.c
View File

@@ -1254,7 +1254,7 @@ static void calendar_event_cb(lv_event_t * e)
{
lv_event_code_t code = lv_event_get_code(e);
lv_obj_t * ta = lv_event_get_user_data(e);
lv_obj_t * obj = lv_event_get_current_target(e);
lv_obj_t * obj = lv_event_get_target(e);
if(code == LV_EVENT_VALUE_CHANGED) {
lv_calendar_date_t d;
lv_calendar_get_pressed_date(obj, &d);

2
demos/widgets/lv_demo_widgets.py
View File

@@ -1314,7 +1314,7 @@ def birthday_event_cb(e):
def calendar_event_cb(e,ta) :
global calendar
code = e.get_code()
obj = lv.calendar.__cast__(e.get_current_target())
obj = lv.calendar.__cast__(e.get_target())
if code == lv.EVENT.VALUE_CHANGED:
d = lv.calendar_date_t()
obj.get_pressed_date(d)

4
examples/event/lv_example_event_3.c
View File

@@ -4,10 +4,10 @@
static void event_cb(lv_event_t * e)
{
/*The original target of the event. Can be the buttons or the container*/
lv_obj_t * target = lv_event_get_target(e);
lv_obj_t * target = lv_event_get_original_target(e);
/*The current target is always the container as the event is added to it*/
lv_obj_t * cont = lv_event_get_current_target(e);
lv_obj_t * cont = lv_event_get_target(e);
/*If container was clicked do nothing*/
if(target == cont) return;

2
examples/others/gridnav/lv_example_gridnav_3.c
View File

@@ -4,7 +4,7 @@
static void cont_sub_event_cb(lv_event_t * e)
{
uint32_t k = lv_event_get_key(e);
lv_obj_t * obj = lv_event_get_current_target(e);
lv_obj_t * obj = lv_event_get_target(e);
if(k == LV_KEY_ENTER) {
lv_group_focus_obj(obj);
}

2
examples/others/gridnav/lv_example_gridnav_3.py
View File

@@ -1,6 +1,6 @@
def cont_sub_event_cb(e):
k = e.get_key()
obj = e.get_current_target()
obj = e.get_target_obj()
if k == lv.KEY.ENTER:
lv.group_focus_obj(obj)

2
examples/widgets/calendar/lv_example_calendar_1.c
View File

@@ -4,7 +4,7 @@
static void event_handler(lv_event_t * e)
{
lv_event_code_t code = lv_event_get_code(e);
lv_obj_t * obj = lv_event_get_current_target(e);
lv_obj_t * obj = lv_event_get_target(e);
if(code == LV_EVENT_VALUE_CHANGED) {
lv_calendar_date_t date;

2
examples/widgets/calendar/lv_example_calendar_1.py
View File

@@ -3,7 +3,7 @@ def event_handler(e):
code = e.get_code()
if code == lv.EVENT.VALUE_CHANGED:
source = e.get_current_target_obj()
source = e.get_target_obj()
date = lv.calendar_date_t()
if source.get_pressed_date(date) == lv.RES.OK:
calendar.set_today_date(date.year, date.month, date.day)

4
examples/widgets/checkbox/lv_example_checkbox_2.c
View File

@@ -9,8 +9,8 @@ static uint32_t active_index_2 = 0;
static void radio_event_handler(lv_event_t * e)
{
uint32_t * active_id = lv_event_get_user_data(e);
lv_obj_t * cont = lv_event_get_current_target(e);
lv_obj_t * act_cb = lv_event_get_target(e);
lv_obj_t * cont = lv_event_get_target(e);
lv_obj_t * act_cb = lv_event_get_original_target(e);
lv_obj_t * old_cb = lv_obj_get_child(cont, *active_id);
/*Do nothing if the container was clicked*/

4
examples/widgets/checkbox/lv_example_checkbox_2.py
View File

@@ -49,8 +49,8 @@ class LV_Example_Checkbox_2:
def radio_event_handler(self,e):
cont = e.get_current_target_obj()
act_cb = e.get_target_obj()
cont = e.get_target_obj()
act_cb = e.get_original_target_obj()
if cont == self.cont1:
active_id = self.active_index_1
else:

2
examples/widgets/msgbox/lv_example_msgbox_1.c
View File

@@ -3,7 +3,7 @@
static void event_cb(lv_event_t * e)
{
lv_obj_t * obj = lv_event_get_current_target(e);
lv_obj_t * obj = lv_event_get_target(e);
LV_UNUSED(obj);
LV_LOG_USER("Button %s clicked", lv_msgbox_get_active_btn_text(obj));
}

2
src/core/lv_disp.c
View File

@@ -735,7 +735,7 @@ lv_res_t lv_disp_send_event(lv_disp_t * disp, lv_event_code_t code, void * user_
lv_memzero(&e, sizeof(e));
e.code = code;
e.target = disp;
e.current_target = disp;
e.original_target = disp;
e.param = user_data;
lv_res_t res;
res = lv_event_send(&disp->event_list, &e, true);

2
src/core/lv_obj.c
View File

@@ -791,7 +791,7 @@ static void lv_obj_event(const lv_obj_class_t * class_p, lv_event_t * e)
LV_UNUSED(class_p);
lv_event_code_t code = lv_event_get_code(e);
lv_obj_t * obj = lv_event_get_current_target(e);
lv_obj_t * obj = lv_event_get_original_target(e);
if(code == LV_EVENT_PRESSED) {
lv_obj_add_state(obj, LV_STATE_PRESSED);
}

22
src/core/lv_obj_event.c
View File

@@ -55,7 +55,7 @@ lv_res_t lv_obj_send_event(lv_obj_t * obj, lv_event_code_t event_code, void * pa
lv_event_t e;
e.target = obj;
e.current_target = obj;
e.original_target = obj;
e.code = event_code;
e.user_data = NULL;
e.param = param;
@@ -75,10 +75,10 @@ lv_res_t lv_obj_send_event(lv_obj_t * obj, lv_event_code_t event_code, void * pa
}
lv_res_t lv_obj_event_base(const lv_obj_class_t * class_p, lv_event_t * e)
lv_res_t lv_event_base(const lv_obj_class_t * class_p, lv_event_t * e)
{
const lv_obj_class_t * base;
if(class_p == NULL) base = ((lv_obj_t *)e->current_target)->class_p;
if(class_p == NULL) base = ((lv_obj_t *)e->target)->class_p;
else base = class_p->base_class;
/*Find a base in which call the ancestor's event handler_cb if set*/
@@ -134,9 +134,9 @@ lv_obj_t * lv_event_get_target_obj(lv_event_t * e)
return lv_event_get_target(e);
}
lv_obj_t * lv_event_get_current_target_obj(lv_event_t * e)
lv_obj_t * lv_event_get_original_target_obj(lv_event_t * e)
{
return lv_event_get_current_target(e);
return lv_event_get_original_target(e);
}
@@ -292,7 +292,7 @@ void lv_event_set_cover_res(lv_event_t * e, lv_cover_res_t res)
static lv_res_t event_send_core(lv_event_t * e)
{
EVENT_TRACE("Sending event %d to %p with %p param", e->code, (void *)e->current_target, e->param);
EVENT_TRACE("Sending event %d to %p with %p param", e->code, (void *)e->original_target, e->param);
/*Call the input device's feedback callback if set*/
lv_indev_t * indev_act = lv_indev_get_act();
@@ -302,22 +302,22 @@ static lv_res_t event_send_core(lv_event_t * e)
if(e->deleted) return LV_RES_INV;
}
lv_obj_t * target = e->current_target;
lv_obj_t * target = e->target;
lv_res_t res = LV_RES_OK;
lv_event_list_t * list = target->spec_attr ? &target->spec_attr->event_list : NULL;
res = lv_event_send(list, e, true);
if(res != LV_RES_OK) return res;
res = lv_obj_event_base(NULL, e);
res = lv_event_base(NULL, e);
if(res != LV_RES_OK) return res;
res = lv_event_send(list, e, false);
if(res != LV_RES_OK) return res;
lv_obj_t * parent = lv_obj_get_parent(e->current_target);
lv_obj_t * parent = lv_obj_get_parent(e->target);
if(parent && event_is_bubbled(e)) {
e->current_target = parent;
e->target = parent;
res = event_send_core(e);
if(res != LV_RES_OK) return res;
}
@@ -340,7 +340,7 @@ static bool event_is_bubbled(lv_event_t * e)
}
/*Check other codes only if bubbling is enabled*/
if(lv_obj_has_flag(e->current_target, LV_OBJ_FLAG_EVENT_BUBBLE) == false) return false;
if(lv_obj_has_flag(e->target, LV_OBJ_FLAG_EVENT_BUBBLE) == false) return false;
switch(e->code) {
case LV_EVENT_HIT_TEST:

10
src/core/lv_obj_event.h
View File

@@ -71,19 +71,19 @@ lv_res_t lv_obj_send_event(struct _lv_obj_t * obj, lv_event_code_t event_code, v
lv_res_t lv_obj_event_base(const lv_obj_class_t * class_p, lv_event_t * e);
/**
* Get the object originally targeted by the event. It's the same even if the event is bubbled.
* Get the current target of the event. It's the object which event handler being called.
* If the event is not bubbled it's the same as "orignal" target.
* @param e pointer to the event descriptor
* @return the target of the event_code
*/
struct _lv_obj_t * lv_event_get_target_obj(lv_event_t * e);
/**
* Get the current target of the event. It's the object which event handler being called.
* If the event is not bubbled it's the same as "normal" target.
* Get the object originally targeted by the event. It's the same even if the event is bubbled.
* @param e pointer to the event descriptor
* @return pointer to the current target of the event_code
* @return pointer to the original target of the event_code
*/
struct _lv_obj_t * lv_event_get_current_target_obj(lv_event_t * e);
struct _lv_obj_t * lv_event_get_original_target_obj(lv_event_t * e);
/**
* Add an event handler function for an object.

6
src/misc/lv_event.c
View File

@@ -146,9 +146,9 @@ void * lv_event_get_target(lv_event_t * e)
return e->target;
}
void * lv_event_get_current_target(lv_event_t * e)
void * lv_event_get_original_target(lv_event_t * e)
{
return e->current_target;
return e->original_target;
}
lv_event_code_t lv_event_get_code(lv_event_t * e)
@@ -188,7 +188,7 @@ void _lv_event_mark_deleted(void * target)
lv_event_t * e = event_head;
while(e) {
if(e->current_target == target || e->target == target) e->deleted = 1;
if(e->original_target == target || e->target == target) e->deleted = 1;
e = e->prev;
}
}

4
src/misc/lv_event.h
View File

@@ -115,7 +115,7 @@ typedef struct {
typedef struct _lv_event_t {
void * target;
void * current_target;
void * original_target;
lv_event_code_t code;
void * user_data;
void * param;
@@ -168,7 +168,7 @@ void * lv_event_get_target(lv_event_t * e);
* @param e pointer to the event descriptor
* @return pointer to the current target of the event_code
*/
void * lv_event_get_current_target(lv_event_t * e);
void * lv_event_get_original_target(lv_event_t * e);
/**
* Get the event code of an event

2
src/others/gridnav/lv_gridnav.c
View File

@@ -132,7 +132,7 @@ void lv_gridnav_set_focused(lv_obj_t * cont, lv_obj_t * to_focus, lv_anim_enable
static void gridnav_event_cb(lv_event_t * e)
{
lv_obj_t * obj = lv_event_get_current_target(e);
lv_obj_t * obj = lv_event_get_original_target(e);
lv_gridnav_dsc_t * dsc = lv_event_get_user_data(e);
lv_event_code_t code = lv_event_get_code(e);

2
src/widgets/arc/lv_arc.c
View File

@@ -434,7 +434,7 @@ static void lv_arc_event(const lv_obj_class_t * class_p, lv_event_t * e)
lv_res_t res;
/*Call the ancestor's event handler*/
res = lv_obj_event_base(MY_CLASS, e);
res = lv_event_base(MY_CLASS, e);
if(res != LV_RES_OK) return;
lv_event_code_t code = lv_event_get_code(e);

2
src/widgets/bar/lv_bar.c
View File

@@ -532,7 +532,7 @@ static void lv_bar_event(const lv_obj_class_t * class_p, lv_event_t * e)
lv_res_t res;
/*Call the ancestor's event handler*/
res = lv_obj_event_base(MY_CLASS, e);
res = lv_event_base(MY_CLASS, e);
if(res != LV_RES_OK) return;
lv_event_code_t code = lv_event_get_code(e);

2
src/widgets/btnmatrix/lv_btnmatrix.c
View File

@@ -390,7 +390,7 @@ static void lv_btnmatrix_event(const lv_obj_class_t * class_p, lv_event_t * e)
lv_res_t res;
/*Call the ancestor's event handler*/
res = lv_obj_event_base(MY_CLASS, e);
res = lv_event_base(MY_CLASS, e);
if(res != LV_RES_OK) return;
lv_event_code_t code = lv_event_get_code(e);

2
src/widgets/chart/lv_chart.c
View File

@@ -722,7 +722,7 @@ static void lv_chart_event(const lv_obj_class_t * class_p, lv_event_t * e)
/*Call the ancestor's event handler*/
lv_res_t res;
res = lv_obj_event_base(MY_CLASS, e);
res = lv_event_base(MY_CLASS, e);
if(res != LV_RES_OK) return;
lv_event_code_t code = lv_event_get_code(e);

2
src/widgets/checkbox/lv_checkbox.c
View File

@@ -150,7 +150,7 @@ static void lv_checkbox_event(const lv_obj_class_t * class_p, lv_event_t * e)
lv_res_t res;
/*Call the ancestor's event handler*/
res = lv_obj_event_base(MY_CLASS, e);
res = lv_event_base(MY_CLASS, e);
if(res != LV_RES_OK) return;
lv_event_code_t code = lv_event_get_code(e);

2
src/widgets/colorwheel/lv_colorwheel.c
View File

@@ -358,7 +358,7 @@ static void lv_colorwheel_event(const lv_obj_class_t * class_p, lv_event_t * e)
LV_UNUSED(class_p);
/*Call the ancestor's event handler*/
lv_res_t res = lv_obj_event_base(MY_CLASS, e);
lv_res_t res = lv_event_base(MY_CLASS, e);
if(res != LV_RES_OK) return;

6
src/widgets/dropdown/lv_dropdown.c
View File

@@ -651,7 +651,7 @@ static void lv_dropdown_event(const lv_obj_class_t * class_p, lv_event_t * e)
lv_res_t res;
/*Call the ancestor's event handler*/
res = lv_obj_event_base(MY_CLASS, e);
res = lv_event_base(MY_CLASS, e);
if(res != LV_RES_OK) return;
lv_event_code_t code = lv_event_get_code(e);
@@ -743,7 +743,7 @@ static void lv_dropdown_list_event(const lv_obj_class_t * class_p, lv_event_t *
/*Call the ancestor's event handler*/
lv_event_code_t code = lv_event_get_code(e);
if(code != LV_EVENT_DRAW_POST) {
res = lv_obj_event_base(MY_CLASS_LIST, e);
res = lv_event_base(MY_CLASS_LIST, e);
if(res != LV_RES_OK) return;
}
lv_obj_t * list = lv_event_get_target(e);
@@ -764,7 +764,7 @@ static void lv_dropdown_list_event(const lv_obj_class_t * class_p, lv_event_t *
}
else if(code == LV_EVENT_DRAW_POST) {
draw_list(e);
res = lv_obj_event_base(MY_CLASS_LIST, e);
res = lv_event_base(MY_CLASS_LIST, e);
if(res != LV_RES_OK) return;
}
}

4
src/widgets/img/lv_img.c
View File

@@ -443,7 +443,7 @@ static void lv_img_event(const lv_obj_class_t * class_p, lv_event_t * e)
/*Ancestor events will be called during drawing*/
if(code != LV_EVENT_DRAW_MAIN && code != LV_EVENT_DRAW_POST) {
/*Call the ancestor's event handler*/
lv_res_t res = lv_obj_event_base(MY_CLASS, e);
lv_res_t res = lv_event_base(MY_CLASS, e);
if(res != LV_RES_OK) return;
}
@@ -602,7 +602,7 @@ static void draw_img(lv_event_t * e)
lv_area_copy(&ori_coords, &obj->coords);
lv_area_copy(&obj->coords, &bg_coords);
lv_res_t res = lv_obj_event_base(MY_CLASS, e);
lv_res_t res = lv_event_base(MY_CLASS, e);
if(res != LV_RES_OK) return;
lv_area_copy(&obj->coords, &ori_coords);

2
src/widgets/imgbtn/lv_imgbtn.c
View File

@@ -178,7 +178,7 @@ static void lv_imgbtn_event(const lv_obj_class_t * class_p, lv_event_t * e)
{
LV_UNUSED(class_p);
lv_res_t res = lv_obj_event_base(&lv_imgbtn_class, e);
lv_res_t res = lv_event_base(&lv_imgbtn_class, e);
if(res != LV_RES_OK) return;
lv_event_code_t code = lv_event_get_code(e);

2
src/widgets/label/lv_label.c
View File

@@ -699,7 +699,7 @@ static void lv_label_event(const lv_obj_class_t * class_p, lv_event_t * e)
LV_UNUSED(class_p);
/*Call the ancestor's event handler*/
const lv_res_t res = lv_obj_event_base(MY_CLASS, e);
const lv_res_t res = lv_event_base(MY_CLASS, e);
if(res != LV_RES_OK) return;
const lv_event_code_t code = lv_event_get_code(e);

2
src/widgets/led/lv_led.c
View File

@@ -166,7 +166,7 @@ static void lv_led_event(const lv_obj_class_t * class_p, lv_event_t * e)
/* Call the ancestor's event handler */
lv_event_code_t code = lv_event_get_code(e);
if(code != LV_EVENT_DRAW_MAIN && code != LV_EVENT_DRAW_MAIN_END) {
res = lv_obj_event_base(MY_CLASS, e);
res = lv_event_base(MY_CLASS, e);
if(res != LV_RES_OK) return;
}

2
src/widgets/line/lv_line.c
View File

@@ -138,7 +138,7 @@ static void lv_line_event(const lv_obj_class_t * class_p, lv_event_t * e)
lv_res_t res;
/*Call the ancestor's event handler*/
res = lv_obj_event_base(MY_CLASS, e);
res = lv_event_base(MY_CLASS, e);
if(res != LV_RES_OK) return;
lv_event_code_t code = lv_event_get_code(e);

2
src/widgets/meter/lv_meter.c
View File

@@ -277,7 +277,7 @@ static void lv_meter_event(const lv_obj_class_t * class_p, lv_event_t * e)
{
LV_UNUSED(class_p);
lv_res_t res = lv_obj_event_base(MY_CLASS, e);
lv_res_t res = lv_event_base(MY_CLASS, e);
if(res != LV_RES_OK) return;
lv_event_code_t code = lv_event_get_code(e);

2
src/widgets/objx_templ/lv_objx_templ.c
View File

@@ -127,7 +127,7 @@ static void lv_templ_event(const lv_obj_class_t * class_p, lv_event_t * e)
lv_res_t res;
/*Call the ancestor's event handler*/
res = lv_obj_event_base(MY_CLASS, e);
res = LV_EVENT_base(MY_CLASS, e);
if(res != LV_RES_OK) return;
/*Add the widget specific event handling here*/

4
src/widgets/roller/lv_roller.c
View File

@@ -326,7 +326,7 @@ static void lv_roller_event(const lv_obj_class_t * class_p, lv_event_t * e)
lv_res_t res;
/*Call the ancestor's event handler*/
res = lv_obj_event_base(MY_CLASS, e);
res = lv_event_base(MY_CLASS, e);
if(res != LV_RES_OK) return;
const lv_event_code_t code = lv_event_get_code(e);
@@ -432,7 +432,7 @@ static void lv_roller_label_event(const lv_obj_class_t * class_p, lv_event_t * e
/*LV_EVENT_DRAW_MAIN will be called in the draw function*/
if(code != LV_EVENT_DRAW_MAIN) {
/* Call the ancestor's event handler */
res = lv_obj_event_base(MY_CLASS_LABEL, e);
res = lv_event_base(MY_CLASS_LABEL, e);
if(res != LV_RES_OK) return;
}

2
src/widgets/slider/lv_slider.c
View File

@@ -102,7 +102,7 @@ static void lv_slider_event(const lv_obj_class_t * class_p, lv_event_t * e)
lv_res_t res;
/*Call the ancestor's event handler*/
res = lv_obj_event_base(MY_CLASS, e);
res = lv_event_base(MY_CLASS, e);
if(res != LV_RES_OK) return;
lv_event_code_t code = lv_event_get_code(e);

2
src/widgets/span/lv_span.c
View File

@@ -533,7 +533,7 @@ static void lv_spangroup_event(const lv_obj_class_t * class_p, lv_event_t * e)
LV_UNUSED(class_p);
/* Call the ancestor's event handler */
if(lv_obj_event_base(MY_CLASS, e) != LV_RES_OK) return;
if(lv_event_base(MY_CLASS, e) != LV_RES_OK) return;
lv_event_code_t code = lv_event_get_code(e);
lv_obj_t * obj = lv_event_get_target(e);

2
src/widgets/spinbox/lv_spinbox.c
View File

@@ -364,7 +364,7 @@ static void lv_spinbox_event(const lv_obj_class_t * class_p, lv_event_t * e)
/*Call the ancestor's event handler*/
lv_res_t res = LV_RES_OK;
res = lv_obj_event_base(MY_CLASS, e);
res = lv_event_base(MY_CLASS, e);
if(res != LV_RES_OK) return;
const lv_event_code_t code = lv_event_get_code(e);

2
src/widgets/switch/lv_switch.c
View File

@@ -113,7 +113,7 @@ static void lv_switch_event(const lv_obj_class_t * class_p, lv_event_t * e)
lv_res_t res;
/*Call the ancestor's event handler*/
res = lv_obj_event_base(MY_CLASS, e);
res = lv_event_base(MY_CLASS, e);
if(res != LV_RES_OK) return;
lv_event_code_t code = lv_event_get_code(e);

2
src/widgets/table/lv_table.c
View File

@@ -459,7 +459,7 @@ static void lv_table_event(const lv_obj_class_t * class_p, lv_event_t * e)
lv_res_t res;
/*Call the ancestor's event handler*/
res = lv_obj_event_base(MY_CLASS, e);
res = lv_event_base(MY_CLASS, e);
if(res != LV_RES_OK) return;
lv_event_code_t code = lv_event_get_code(e);

2
src/widgets/tabview/lv_tabview.c
View File

@@ -290,7 +290,7 @@ static void lv_tabview_destructor(const lv_obj_class_t * class_p, lv_obj_t * obj
static void lv_tabview_event(const lv_obj_class_t * class_p, lv_event_t * e)
{
LV_UNUSED(class_p);
lv_res_t res = lv_obj_event_base(&lv_tabview_class, e);
lv_res_t res = lv_event_base(&lv_tabview_class, e);
if(res != LV_RES_OK) return;
lv_event_code_t code = lv_event_get_code(e);

2
src/widgets/textarea/lv_textarea.c
View File

@@ -877,7 +877,7 @@ static void lv_textarea_event(const lv_obj_class_t * class_p, lv_event_t * e)
lv_res_t res;
/*Call the ancestor's event handler*/
res = lv_obj_event_base(MY_CLASS, e);
res = lv_event_base(MY_CLASS, e);
if(res != LV_RES_OK) return;
lv_event_code_t code = lv_event_get_code(e);