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

lv_label: scroll anim position bugifx

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi 2017-10-11 16:03:43 +02:00
parent a7a6812a19
commit bf8cf9fb81
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lv_objx/lv_label.c
View File

@ -132,20 +132,23 @@ bool lv_label_signal(lv_obj_t * label, lv_signal_t sign, void * param)
* make the object specific signal handling */
if(valid != false) {
lv_label_ext_t * ext = lv_obj_get_ext(label);
/*No signal handling*/
switch(sign) {
case LV_SIGNAL_CLEANUP:
if(ext->static_txt == 0) {
dm_free(ext->txt);
ext->txt = NULL;
}
break;
case LV_SIGNAL_STYLE_CHG:
lv_label_set_text(label, NULL);
break;
default:
break;
}
if(sign == LV_SIGNAL_CLEANUP) {
if(ext->static_txt == 0) {
dm_free(ext->txt);
ext->txt = NULL;
}
}
else if(sign == LV_SIGNAL_STYLE_CHG) {
lv_label_refr_text(label);
}
else if (sign == LV_SIGNAL_CORD_CHG) {
if(area_get_width(&label->cords) != area_get_width(param)
|| area_get_height(&label->cords) != area_get_height(param))
{
lv_label_refr_text(label);
}
}
}
return valid;
@ -624,7 +627,7 @@ static void lv_label_refr_text(lv_obj_t * label)
if(lv_obj_get_height(label) > lv_obj_get_height(parent)) {
anim.end = lv_obj_get_height(parent) - lv_obj_get_height(label) -
(font_get_height(font) - FONT_ANTIALIAS);
(font_get_height(font) >> FONT_ANTIALIAS);
anim.fp = (anim_fp_t)lv_obj_set_y;
/*Different animation speed if horizontal animation is created too*/
@ -662,7 +665,7 @@ static void lv_label_refr_text(lv_obj_t * label)
if(size.y > lv_obj_get_height(label)) {
anim.end = lv_obj_get_height(label) - size.y -
(font_get_height(font) - FONT_ANTIALIAS);
(font_get_height(font) >> FONT_ANTIALIAS);
anim.fp = (anim_fp_t)lv_label_set_offset_y;
/*Different animation speed if horizontal animation is created too*/