minor fixes

This commit is contained in:
Gabor Kiss-Vamosi
2019-05-07 12:15:02 +02:00
parent b7850e2584
commit 0b31110d3e
5 changed files with 52 additions and 12 deletions

View File

@@ -57,6 +57,7 @@ static lv_res_t lv_obj_signal(lv_obj_t * obj, lv_signal_t sign, void * param);
**********************/ **********************/
static bool lv_initialized = false; static bool lv_initialized = false;
static lv_event_temp_data_t * event_temp_data_head; static lv_event_temp_data_t * event_temp_data_head;
static const void * event_act_data;
/********************** /**********************
* MACROS * MACROS
@@ -1283,6 +1284,23 @@ lv_res_t lv_event_send(lv_obj_t * obj, lv_event_t event, const void * data)
{ {
if(obj == NULL) return LV_RES_OK; if(obj == NULL) return LV_RES_OK;
lv_res_t res;
res = lv_event_send_func(obj->event_cb, obj, event, data);
return res;
}
/**
* Call an event function with an object, event, and data.
* @param event_cb an event callback function. If `NULL` `LV_RES_OK` will return without any actions.
* @param obj pointer to an object to associate with the event (can be `NULL` to simply call the `event_cb`)
* @param event an event
* @param data pointer to a custom data
* @return LV_RES_OK: `obj` was not deleted in the event; LV_RES_INV: `obj` was deleted in the event
*/
lv_res_t lv_event_send_func(lv_event_cb_t event_cb, lv_obj_t * obj, lv_event_t event, const void * data)
{
if(event_cb == NULL) return LV_RES_OK;
lv_event_temp_data_t event_temp_data; lv_event_temp_data_t event_temp_data;
event_temp_data.obj = obj; event_temp_data.obj = obj;
event_temp_data.deleted = false; event_temp_data.deleted = false;
@@ -1297,18 +1315,26 @@ lv_res_t lv_event_send(lv_obj_t * obj, lv_event_t event, const void * data)
event_temp_data_head = &event_temp_data; event_temp_data_head = &event_temp_data;
if(obj->event_cb) obj->event_cb(obj, event); event_act_data = data;
if(event_cb) event_cb(obj, event);
/*Remove this element from the list*/ /*Remove this element from the list*/
event_temp_data_head = event_temp_data_head->prev; event_temp_data_head = event_temp_data_head->prev;
if(event_temp_data.deleted) { if(event_temp_data.deleted) {
event_act_data = NULL;
return LV_RES_INV; return LV_RES_INV;
} }
if(obj) {
if(obj->parent_event && obj->par) { if(obj->parent_event && obj->par) {
lv_res_t res = lv_event_send(obj->par, event, data); lv_res_t res = lv_event_send(obj->par, event, data);
if(res != LV_RES_OK) return LV_RES_INV; if(res != LV_RES_OK) {
event_act_data = NULL;
return LV_RES_INV;
}
}
} }
return LV_RES_OK; return LV_RES_OK;
@@ -1320,7 +1346,7 @@ lv_res_t lv_event_send(lv_obj_t * obj, lv_event_t event, const void * data)
*/ */
const void * lv_event_get_data(void) const void * lv_event_get_data(void)
{ {
return NULL; //event_act_data; return event_act_data;
} }
/** /**
@@ -1981,14 +2007,15 @@ void lv_obj_get_type(lv_obj_t * obj, lv_obj_type_t * buf)
} }
#if LV_USE_USER_DATA_SINGLE #if LV_USE_USER_DATA_SINGLE
/** /**
* Get a pointer to the object's user data * Get a pointer to the object's user data
* @param obj pointer to an object * @param obj pointer to an object
* @return pointer to the user data * @return pointer to the user data
*/ */
lv_obj_user_data_t * lv_obj_get_user_data(lv_obj_t * obj) lv_obj_user_data_t lv_obj_get_user_data(lv_obj_t * obj)
{ {
return &obj->user_data; return obj->user_data;
} }
/** /**

View File

@@ -565,6 +565,16 @@ void lv_obj_set_event_cb(lv_obj_t * obj, lv_event_cb_t event_cb);
*/ */
lv_res_t lv_event_send(lv_obj_t * obj, lv_event_t event, const void * data); lv_res_t lv_event_send(lv_obj_t * obj, lv_event_t event, const void * data);
/**
* Call an event function with an object, event, and data.
* @param event_cb an event callback function
* @param obj pointer to an object to associate with the event (can be `NULL` to simply call the `event_cb`)
* @param event an event
* @param data pointer to a custom data
* @return LV_RES_OK: `obj` was not deleted in the event; LV_RES_INV: `obj` was deleted in the event
*/
lv_res_t lv_event_send_func(lv_event_cb_t event_cb, lv_obj_t * obj, lv_event_t event, const void * data);
/** /**
* Get the `data` parameter of the current event * Get the `data` parameter of the current event
* @return the `data` parameter * @return the `data` parameter
@@ -920,7 +930,7 @@ void lv_obj_get_type(lv_obj_t * obj, lv_obj_type_t * buf);
* @param obj pointer to an object * @param obj pointer to an object
* @return pointer to the user data * @return pointer to the user data
*/ */
lv_obj_user_data_t * lv_obj_get_user_data(lv_obj_t * obj); lv_obj_user_data_t lv_obj_get_user_data(lv_obj_t * obj);
/** /**
* Set the object's user data. The data will be copied. * Set the object's user data. The data will be copied.

View File

@@ -69,7 +69,12 @@ void lv_refr_init(void)
*/ */
void lv_refr_now(void) void lv_refr_now(void)
{ {
lv_disp_refr_task(NULL); lv_disp_t * d;
d = lv_disp_get_next(NULL);
while(d) {
lv_disp_refr_task(d->refr_task);
d = lv_disp_get_next(NULL);
}
} }
/** /**

View File

@@ -77,7 +77,7 @@ lv_anim_t a;
a.var = obj; a.var = obj;
a.start = lv_obj_get_height(obj); a.start = lv_obj_get_height(obj);
a.end = new_height; a.end = new_height;
a.exec_cb = (lv_anim_fp_t)lv_obj_set_height; a.exec_cb = (lv_anim_exec_cb_t)lv_obj_set_height;
a.path_cb = lv_anim_path_linear; a.path_cb = lv_anim_path_linear;
a.ready_cb = NULL; a.ready_cb = NULL;
a.act_time = 0; a.act_time = 0;

View File

@@ -57,9 +57,7 @@ typedef struct _lv_task_t
uint32_t last_run; uint32_t last_run;
void (*task_cb)(struct _lv_task_t *); void (*task_cb)(struct _lv_task_t *);
#if LV_USE_USER_DATA_SINGLE
void * user_data; void * user_data;
#endif
#if LV_USE_USER_DATA_MULTI #if LV_USE_USER_DATA_MULTI
void * task_user_data; void * task_user_data;