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
c4763559
Commit
c4763559
authored
Jun 11, 2016
by
Kiss-Vamosi Gabor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor bugfixes
parent
fc83ee99
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
6 deletions
+1
-6
lv_label.h
lv_objx/lv_label.h
+0
-1
lv_rect.c
lv_objx/lv_rect.c
+1
-5
No files found.
lv_objx/lv_label.h
View file @
c4763559
...
@@ -27,7 +27,6 @@ typedef struct
...
@@ -27,7 +27,6 @@ typedef struct
{
{
font_types_t
font
;
font_types_t
font
;
color_t
color
;
color_t
color
;
color_t
bg_color
;
uint16_t
letter_space
;
uint16_t
letter_space
;
uint16_t
line_space
;
uint16_t
line_space
;
uint8_t
mid
:
1
;
uint8_t
mid
:
1
;
...
...
lv_objx/lv_rect.c
View file @
c4763559
...
@@ -67,15 +67,11 @@ lv_obj_t* lv_rect_create(lv_obj_t* par_dp, lv_obj_t * copy_dp)
...
@@ -67,15 +67,11 @@ lv_obj_t* lv_rect_create(lv_obj_t* par_dp, lv_obj_t * copy_dp)
lv_obj_set_design_f
(
new_obj_dp
,
lv_rect_design
);
lv_obj_set_design_f
(
new_obj_dp
,
lv_rect_design
);
lv_obj_set_signal_f
(
new_obj_dp
,
lv_rect_signal
);
lv_obj_set_signal_f
(
new_obj_dp
,
lv_rect_signal
);
/*Init the new rectangle*/
/*Init the new rectangle*/
if
(
copy_dp
==
NULL
)
{
if
(
copy_dp
==
NULL
)
{
lv_obj_set_style
(
new_obj_dp
,
&
lv_rects_def
);
lv_obj_set_style
(
new_obj_dp
,
&
lv_rects_def
);
}
}
/*Copy 'copy_dp' if it is not NULL*/
else
{
lv_obj_set_style
(
new_obj_dp
,
lv_obj_get_style
(
copy_dp
));
}
return
new_obj_dp
;
return
new_obj_dp
;
}
}
...
...
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