Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-28 07:03:00 +08:00
Code Issues Projects Releases Wiki Activity

minor renames

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi 2017-12-02 15:04:44 +01:00
parent defa3a0922
commit 525c8d3dd9
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lv_core/lv_obj.c
View File

@ -918,8 +918,8 @@ void lv_obj_animate(lv_obj_t * obj, lv_anim_builtin_t type, uint16_t time, uint1
lv_obj_t * par = lv_obj_get_parent(obj);
/*Get the direction*/
bool out = (type & ANIM_DIR_MASK) == LV_ANIM_IN ? false : true;
type = type & (~ANIM_DIR_MASK);
bool out = (type & LV_ANIM_DIR_MASK) == LV_ANIM_IN ? false : true;
type = type & (~LV_ANIM_DIR_MASK);
lv_anim_t a;
a.var = obj;

6
lv_core/lv_obj.h
View File

@ -47,9 +47,9 @@ extern "C" {
#error "LV: Small Virtual Display Buffer (lv_conf.h: LV_VDB_SIZE >= (2 * LV_HOR_RES))"
#endif
#define LV_ANIM_IN 0x00 /*Animation to show an object. 'OR' it with lv_anim_builtin_t*/
#define ANIM_OUT 0x80 /*Animation to hide an object. 'OR' it with lv_anim_builtin_t*/
#define ANIM_DIR_MASK 0x80 /*ANIM_IN/ANIM_OUT mask*/
#define LV_ANIM_IN 0x00 /*Animation to show an object. 'OR' it with lv_anim_builtin_t*/
#define LV_ANIM_OUT 0x80 /*Animation to hide an object. 'OR' it with lv_anim_builtin_t*/
#define LV_ANIM_DIR_MASK 0x80 /*ANIM_IN/ANIM_OUT mask*/
/**********************
* TYPEDEFS

4
lv_objx/lv_mbox.c
View File

@ -203,8 +203,8 @@ void lv_mbox_start_auto_close(lv_obj_t * mbox, uint16_t delay)
#if LV_NO_ANIM == 0
if(ext->anim_time != 0) {
/*Add shrinking animations*/
lv_obj_animate(mbox, LV_ANIM_GROW_H| ANIM_OUT, ext->anim_time, delay, NULL);
lv_obj_animate(mbox, LV_ANIM_GROW_V| ANIM_OUT, ext->anim_time, delay, (void (*)(lv_obj_t*))lv_obj_del);
lv_obj_animate(mbox, LV_ANIM_GROW_H| LV_ANIM_OUT, ext->anim_time, delay, NULL);
lv_obj_animate(mbox, LV_ANIM_GROW_V| LV_ANIM_OUT, ext->anim_time, delay, (void (*)(lv_obj_t*))lv_obj_del);
/*Disable fit to let shrinking work*/
lv_cont_set_fit(mbox, false, false);