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
ecc8c8af
Commit
ecc8c8af
authored
Sep 11, 2017
by
Gabor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lv_label: draw background if the style explictly set
parent
0c45e9ea
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
lv_label.c
lv_objx/lv_label.c
+5
-0
lv_ta.c
lv_objx/lv_ta.c
+0
-1
No files found.
lv_objx/lv_label.c
View file @
ecc8c8af
...
...
@@ -524,6 +524,11 @@ static bool lv_label_design(lv_obj_t * label, const area_t * mask, lv_design_mod
}
#endif
/*If the style is set explicitly draw background too*/
if
(
label
->
style_p
!=
NULL
)
{
lv_draw_rect
(
&
cords
,
mask
,
style
);
}
/*TEST: draw a background for the label*/
//lv_vfill(&label->cords, mask, COLOR_LIME, OPA_COVER);
...
...
lv_objx/lv_ta.c
View file @
ecc8c8af
...
...
@@ -166,7 +166,6 @@ bool lv_ta_signal(lv_obj_t * ta, lv_signal_t sign, void * param)
/* (The created label will be deleted automatically) */
}
else
if
(
sign
==
LV_SIGNAL_STYLE_CHG
)
{
if
(
ext
->
label
)
{
lv_obj_set_style
(
ext
->
label
,
lv_obj_get_style
(
ext
->
page
.
scrl
));
lv_obj_set_width
(
ext
->
label
,
lv_obj_get_width
(
ta
)
-
2
*
(
style
->
hpad
+
style
->
hpad
));
lv_label_set_text
(
ext
->
label
,
NULL
);
...
...
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