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

minor fixes

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2019-05-08 12:04:02 +02:00
parent e7e24697ea
commit 861e090023
4 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lv_core/lv_refr.c
View File

@@ -73,7 +73,7 @@ void lv_refr_now(void)
d = lv_disp_get_next(NULL); d = lv_disp_get_next(NULL);
while(d) { while(d) {
lv_disp_refr_task(d->refr_task); lv_disp_refr_task(d->refr_task);
d = lv_disp_get_next(NULL); d = lv_disp_get_next(d);
} }
} }

2
src/lv_misc/lv_task.c
View File

@@ -204,9 +204,7 @@ lv_task_t * lv_task_create(void (*task)(lv_task_t *), uint32_t period, lv_task_p
new_lv_task->once = 0; new_lv_task->once = 0;
new_lv_task->last_run = lv_tick_get(); new_lv_task->last_run = lv_tick_get();
#if LV_USE_USER_DATA_SINGLE
new_lv_task->user_data = user_data; new_lv_task->user_data = user_data;
#endif
#if LV_USE_USER_DATA_MULTI #if LV_USE_USER_DATA_MULTI
new_lv_task->task_user_data = NULL; new_lv_task->task_user_data = NULL;

2
src/lv_objx/lv_mbox.c
View File

@@ -215,7 +215,6 @@ void lv_mbox_start_auto_close(lv_obj_t * mbox, uint16_t delay)
a.playback_pause = 0; a.playback_pause = 0;
a.repeat = 0; a.repeat = 0;
a.repeat_pause = 0; a.repeat_pause = 0;
a.user_data = NULL;
lv_anim_create(&a); lv_anim_create(&a);
a.start = lv_obj_get_width(mbox); a.start = lv_obj_get_width(mbox);
@@ -239,7 +238,6 @@ void lv_mbox_start_auto_close(lv_obj_t * mbox, uint16_t delay)
a.playback_pause = 0; a.playback_pause = 0;
a.repeat = 0; a.repeat = 0;
a.repeat_pause = 0; a.repeat_pause = 0;
a.user_data = NULL;
lv_anim_create(&a); lv_anim_create(&a);
} }
#else #else

20
src/lv_objx/lv_ta.c
View File

@@ -48,6 +48,7 @@ static lv_res_t lv_ta_scrollable_signal(lv_obj_t * scrl, lv_signal_t sign, void
static void cursor_blink_anim(lv_obj_t * ta, uint8_t show); static void cursor_blink_anim(lv_obj_t * ta, uint8_t show);
static void pwd_char_hider_anim(lv_obj_t * ta, int32_t x); static void pwd_char_hider_anim(lv_obj_t * ta, int32_t x);
#endif #endif
static void pwd_char_hider_anim_ready(lv_anim_t * a);
static void pwd_char_hider(lv_obj_t * ta); static void pwd_char_hider(lv_obj_t * ta);
static bool char_is_accepted(lv_obj_t * ta, uint32_t c); static bool char_is_accepted(lv_obj_t * ta, uint32_t c);
static void get_cursor_style(lv_obj_t * ta, lv_style_t * style_res); static void get_cursor_style(lv_obj_t * ta, lv_style_t * style_res);
@@ -252,7 +253,7 @@ void lv_ta_add_char(lv_obj_t * ta, uint32_t c)
a.exec_cb = (lv_anim_exec_cb_t)pwd_char_hider_anim; a.exec_cb = (lv_anim_exec_cb_t)pwd_char_hider_anim;
a.time = LV_TA_PWD_SHOW_TIME; a.time = LV_TA_PWD_SHOW_TIME;
a.act_time = 0; a.act_time = 0;
a.ready_cb = (lv_anim_ready_cb_t)pwd_char_hider; a.ready_cb = pwd_char_hider_anim_ready;
a.start = 0; a.start = 0;
a.end = 1; a.end = 1;
a.repeat = 0; a.repeat = 0;
@@ -332,7 +333,7 @@ void lv_ta_add_text(lv_obj_t * ta, const char * txt)
a.exec_cb = (lv_anim_exec_cb_t)pwd_char_hider_anim; a.exec_cb = (lv_anim_exec_cb_t)pwd_char_hider_anim;
a.time = LV_TA_PWD_SHOW_TIME; a.time = LV_TA_PWD_SHOW_TIME;
a.act_time = 0; a.act_time = 0;
a.ready_cb = (lv_anim_ready_cb_t)pwd_char_hider; a.ready_cb = pwd_char_hider_anim_ready;
a.start = 0; a.start = 0;
a.end = 1; a.end = 1;
a.repeat = 0; a.repeat = 0;
@@ -469,10 +470,10 @@ void lv_ta_set_text(lv_obj_t * ta, const char * txt)
/*Auto hide characters*/ /*Auto hide characters*/
lv_anim_t a; lv_anim_t a;
a.var = ta; a.var = ta;
a.exec_cb = (lv_anim_exec_cb_t)pwd_char_hider_anim; a.exec_cb = (lv_anim_exec_cb_t)pwd_char_hider_anim;
a.time = LV_TA_PWD_SHOW_TIME; a.time = LV_TA_PWD_SHOW_TIME;
a.act_time = 0; a.act_time = 0;
a.ready_cb = (lv_anim_ready_cb_t)pwd_char_hider; a.ready_cb = pwd_char_hider_anim_ready;
a.start = 0; a.start = 0;
a.end = 1; a.end = 1;
a.repeat = 0; a.repeat = 0;
@@ -1418,6 +1419,17 @@ static void pwd_char_hider_anim(lv_obj_t * ta, int32_t x)
#endif #endif
/**
* Call when an animation is ready to convert all characters to '*'
* @param a pointer to the animation
*/
static void pwd_char_hider_anim_ready(lv_anim_t * a)
{
lv_obj_t * ta = a->var;
pwd_char_hider(ta);
}
/** /**
* Hide all characters (convert them to '*') * Hide all characters (convert them to '*')
* @param ta: pointer to text area object * @param ta: pointer to text area object