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

fix(style) rename path_cb to path_xcb in lv_style_transition_dsc_init

Browse Source 
It was required for the MicroPython binding
This commit is contained in:
Gabor Kiss-Vamosi
2021-04-20 13:54:35 +02:00
parent c2d6c3805c
commit 13d38f6a52
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/misc/lv_style.c
View File

@@ -198,11 +198,11 @@ lv_res_t lv_style_get_prop(lv_style_t * style, lv_style_prop_t prop, lv_style_va
return lv_style_get_prop_inlined(style, prop, value); return lv_style_get_prop_inlined(style, prop, value);
} }
void lv_style_transition_dsc_init(lv_style_transition_dsc_t * tr, const lv_style_prop_t * props, lv_anim_path_cb_t path_cb, uint32_t time, uint32_t delay) void lv_style_transition_dsc_init(lv_style_transition_dsc_t * tr, const lv_style_prop_t * props, lv_anim_path_cb_t path_xcb, uint32_t time, uint32_t delay)
{ {
lv_memset_00(tr, sizeof(lv_style_transition_dsc_t)); lv_memset_00(tr, sizeof(lv_style_transition_dsc_t));
tr->props = props; tr->props = props;
tr->path_cb = path_cb == NULL ? lv_anim_path_linear : path_cb; tr->path_cb = path_xcb == NULL ? lv_anim_path_linear : path_xcb;
tr->time = time; tr->time = time;
tr->delay = delay; tr->delay = delay;
} }

5
src/misc/lv_style.h
View File

@@ -358,16 +358,15 @@ static inline lv_res_t lv_style_get_prop_inlined(lv_style_t * style, lv_style_pr
* Initialize a transition descriptor. * Initialize a transition descriptor.
* @param tr pointer to a transition descriptor to initialize * @param tr pointer to a transition descriptor to initialize
* @param props an array with the properties to transition. The last element must be zero. * @param props an array with the properties to transition. The last element must be zero.
* @param path_cb and animation path (ease) callback. If `NULL` liner path will be used. * @param path_xcb and animation path (ease) callback. If `NULL` liner path will be used.
* @param time duration of the transition in [ms] * @param time duration of the transition in [ms]
* @param delay delay before the transition in [ms] * @param delay delay before the transition in [ms]
* @example * @example
* const static lv_style_prop_t trans_props[] = { LV_STYLE_BG_OPA, LV_STYLE_BG_COLOR, 0 }; * const static lv_style_prop_t trans_props[] = { LV_STYLE_BG_OPA, LV_STYLE_BG_COLOR, 0 };
* static lv_style_transition_dsc_t trans1; * static lv_style_transition_dsc_t trans1;
* lv_style_transition_dsc_init(&trans1, trans_props, NULL, 300, 0); * lv_style_transition_dsc_init(&trans1, trans_props, NULL, 300, 0);
* @note For performance reasons there are no sanity check on `style`
*/ */
void lv_style_transition_dsc_init(lv_style_transition_dsc_t * tr, const lv_style_prop_t * props, lv_anim_path_cb_t path_cb, uint32_t time, uint32_t delay); void lv_style_transition_dsc_init(lv_style_transition_dsc_t * tr, const lv_style_prop_t * props, lv_anim_path_cb_t path_xcb, uint32_t time, uint32_t delay);
/** /**
* Get the default value of a property * Get the default value of a property