BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
lvgl
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
lvgl
Commits
36f236bc
Commit
36f236bc
authored
Nov 07, 2017
by
Gabor Kiss-Vamosi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lv_label: roll long mode bugfix on size change
parent
b160b1d1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
2 deletions
+11
-2
lv_label.c
lv_objx/lv_label.c
+11
-2
No files found.
lv_objx/lv_label.c
View file @
36f236bc
...
...
@@ -146,8 +146,8 @@ bool lv_label_signal(lv_obj_t * label, lv_signal_t sign, void * param)
lv_label_refr_text
(
label
);
}
else
if
(
sign
==
LV_SIGNAL_CORD_CHG
)
{
if
(
area_get_width
(
&
label
->
coords
)
!=
area_get_width
(
param
)
||
area_get_height
(
&
label
->
coords
)
!=
area_get_height
(
param
))
if
(
area_get_width
(
&
label
->
coords
)
!=
area_get_width
(
param
)
||
area_get_height
(
&
label
->
coords
)
!=
area_get_height
(
param
))
{
lv_label_refr_text
(
label
);
}
...
...
@@ -731,6 +731,10 @@ static void lv_label_refr_text(lv_obj_t * label)
anim
.
time
=
anim_speed_to_time
(
LV_LABEL_SCROLL_SPEED
,
anim
.
start
,
anim
.
end
);
anim_create
(
&
anim
);
hor_anim
=
true
;
}
else
{
/*Delete the offset animation if not required*/
anim_del
(
label
,
(
anim_fp_t
)
lv_label_set_offset_x
);
ext
->
offset
.
x
=
0
;
}
if
(
size
.
y
>
lv_obj_get_height
(
label
))
{
...
...
@@ -745,6 +749,11 @@ static void lv_label_refr_text(lv_obj_t * label)
anim
.
time
=
anim_speed_to_time
(
LV_LABEL_SCROLL_SPEED_VER
,
anim
.
start
,
anim
.
end
);
}
anim_create
(
&
anim
);
}
else
{
/*Delete the offset animation if not required*/
anim_del
(
label
,
(
anim_fp_t
)
lv_label_set_offset_y
);
ext
->
offset
.
y
=
0
;
}
}
/*In break mode only the height can change*/
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment