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

anim path reworked + minor changes

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2017-12-17 01:54:09 +01:00
parent 7dad802981
commit f242eba9c1
23 changed files with 108 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lv_core/lv_indev.c
View File

@@ -74,7 +74,7 @@ lv_indev_t * lv_indev_get_act(void)
/**
* Reset one or all input devices
* @param indev
* @param indev pointer to an input device to reset or NULL to reset all of them
*/
void lv_indev_reset(lv_indev_t * indev)
{
@@ -90,13 +90,13 @@ void lv_indev_reset(lv_indev_t * indev)
/**
* Reset the long press state of an input device
* @param indev_proc pointer to an input device
* @param indev pointer to an input device
*/
void lv_indev_reset_lpr(lv_indev_t * indev_proc)
void lv_indev_reset_lpr(lv_indev_t * indev)
{
indev_proc->proc.long_pr_sent = 0;
indev_proc->proc.longpr_rep_timestamp = lv_tick_get();
indev_proc->proc.pr_timestamp = lv_tick_get();
indev->proc.long_pr_sent = 0;
indev->proc.longpr_rep_timestamp = lv_tick_get();
indev->proc.pr_timestamp = lv_tick_get();
}
/**
@@ -115,8 +115,8 @@ void lv_indev_enable(lv_hal_indev_type_t type, bool enable)
}
/**
* Set a cursor for a mouse input device
* @param indev pointer to an input device (type: 'LV_INDEV_TYPE_MOUSE')
* Set a cursor for a pointer input device
* @param indev pointer to an input device (type: 'LV_INDEV_TYPE_POINTER')
* @param cur_obj pointer to an object to be used as cursor
*/
void lv_indev_set_cursor(lv_indev_t *indev, lv_obj_t *cur_obj)

8
lv_core/lv_indev.h
View File

@@ -42,7 +42,7 @@ lv_indev_t * lv_indev_get_act(void);
/**
* Reset one or all input devices
* @param indev
* @param indev pointer to an input device to reset or NULL to reset all of them
*/
void lv_indev_reset(lv_indev_t * indev);
@@ -50,7 +50,7 @@ void lv_indev_reset(lv_indev_t * indev);
* Reset the long press state of an input device
* @param indev_proc pointer to an input device
*/
void lv_indev_reset_lpr(lv_indev_t * indev_proc);
void lv_indev_reset_lpr(lv_indev_t * indev);
/**
* Enable input devices device by type
@@ -60,8 +60,8 @@ void lv_indev_reset_lpr(lv_indev_t * indev_proc);
void lv_indev_enable(lv_hal_indev_type_t type, bool enable);
/**
* Set a cursor for a mouse input device
* @param indev pointer to an input device (type: 'LV_INDEV_TYPE_MOUSE')
* Set a cursor for a pointer input device
* @param indev pointer to an input device (type: 'LV_INDEV_TYPE_POINTER')
* @param cur_obj pointer to an object to be used as cursor
*/
void lv_indev_set_cursor(lv_indev_t *indev, lv_obj_t *cur_obj);

4
lv_core/lv_obj.c
View File

@@ -729,7 +729,7 @@ void lv_obj_refresh_style(lv_obj_t * obj)
* @param style pointer to a style. Only the objects with this style will be notified
* (NULL to notify all objects)
*/
void lv_obj_report_style_mod(void * style)
void lv_obj_report_style_mod(lv_style_t * style)
{
lv_obj_t * i;
LL_READ(scr_ll, i) {
@@ -927,7 +927,7 @@ void lv_obj_animate(lv_obj_t * obj, lv_anim_builtin_t type, uint16_t time, uint1
a.time = time;
a.act_time = (int32_t)-delay;
a.end_cb = (void(*)(void*))cb;
a.path = lv_anim_get_path(LV_ANIM_PATH_LIN);
a.path = lv_anim_path_linear;
a.playback_pause = 0;
a.repeat_pause = 0;
a.playback = 0;

2
lv_core/lv_obj.h
View File

@@ -332,7 +332,7 @@ void lv_obj_refresh_style(lv_obj_t * obj);
* @param style pointer to a style. Only the objects with this style will be notified
* (NULL to notify all objects)
*/
void lv_obj_report_style_mod(void * style);
void lv_obj_report_style_mod(lv_style_t * style);
/*-----------------
* Attribute set

4
lv_core/lv_style.c
View File

@@ -133,7 +133,7 @@ void lv_style_init (void)
/*Pretty color style*/
memcpy(&lv_style_pretty_color, &lv_style_pretty, sizeof(lv_style_t));
lv_style_pretty_color.text.color = LV_COLOR_MAKE(0xd0, 0xd0, 0xd0);
lv_style_pretty_color.text.color = LV_COLOR_MAKE(0xe0, 0xe0, 0xe0);
lv_style_pretty_color.image.color = LV_COLOR_MAKE(0xe0, 0xe0, 0xe0);
lv_style_pretty_color.line.color = LV_COLOR_MAKE(0xc0, 0xc0, 0xc0);
lv_style_pretty_color.body.main_color = LV_COLOR_MAKE(0x6b, 0x9a, 0xc7);
@@ -236,7 +236,7 @@ void lv_style_anim_create(lv_style_anim_t * anim)
a.start = 0;
a.end = LV_STYLE_ANIM_RES;
a.fp = (lv_anim_fp_t)style_animator;
a.path = lv_anim_get_path(LV_ANIM_PATH_LIN);
a.path = lv_anim_path_linear;
a.end_cb = style_animation_common_end_cb;
a.act_time = anim->act_time;
a.time = anim->time;