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
47f2e0a8
Commit
47f2e0a8
authored
Nov 30, 2017
by
Gabor Kiss-Vamosi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
solve warnings
parent
b5af497a
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
43 additions
and
45 deletions
+43
-45
lv_indev.c
lv_core/lv_indev.c
+6
-6
lv_obj.c
lv_core/lv_obj.c
+6
-12
lv_style.c
lv_core/lv_style.c
+1
-1
lv_mem.c
lv_misc/lv_mem.c
+3
-3
lv_bar.c
lv_objx/lv_bar.c
+1
-1
lv_btn.c
lv_objx/lv_btn.c
+1
-2
lv_btnm.c
lv_objx/lv_btnm.c
+0
-1
lv_page.c
lv_objx/lv_page.c
+8
-2
lv_roller.c
lv_objx/lv_roller.c
+0
-1
lv_slider.c
lv_objx/lv_slider.c
+17
-16
No files found.
lv_core/lv_indev.c
View file @
47f2e0a8
...
@@ -468,16 +468,16 @@ static lv_obj_t * indev_search_obj(const lv_indev_proc_t * indev, lv_obj_t * obj
...
@@ -468,16 +468,16 @@ static lv_obj_t * indev_search_obj(const lv_indev_proc_t * indev, lv_obj_t * obj
}
}
}
}
/*If then the children was not ok,
but
this obj is clickable
/*If then the children was not ok,
and
this obj is clickable
* and it or its parent is not hidden then save this object*/
* and it or its parent is not hidden then save this object*/
if
(
found_p
==
NULL
&&
lv_obj_get_click
(
obj
)
!=
false
)
{
if
(
found_p
==
NULL
&&
lv_obj_get_click
(
obj
)
!=
false
)
{
lv_obj_t
*
i
=
obj
;
lv_obj_t
*
hidden_
i
=
obj
;
while
(
i
!=
NULL
)
{
while
(
hidden_
i
!=
NULL
)
{
if
(
lv_obj_get_hidden
(
i
)
==
true
)
break
;
if
(
lv_obj_get_hidden
(
hidden_
i
)
==
true
)
break
;
i
=
lv_obj_get_parent
(
i
);
hidden_i
=
lv_obj_get_parent
(
hidden_
i
);
}
}
/*No parent found with hidden == true*/
/*No parent found with hidden == true*/
if
(
i
==
NULL
)
found_p
=
obj
;
if
(
hidden_
i
==
NULL
)
found_p
=
obj
;
}
}
}
}
...
...
lv_core/lv_obj.c
View file @
47f2e0a8
...
@@ -100,12 +100,6 @@ void lv_init(void)
...
@@ -100,12 +100,6 @@ void lv_init(void)
/*Init the input device handling*/
/*Init the input device handling*/
lv_indev_init
();
lv_indev_init
();
#endif
#endif
/*Initialize the application level*/
#if LV_APP_ENABLE != 0
lv_app_init
();
#endif
}
}
/*--------------------
/*--------------------
...
@@ -144,11 +138,11 @@ lv_obj_t * lv_obj_create(lv_obj_t * parent, lv_obj_t * copy)
...
@@ -144,11 +138,11 @@ lv_obj_t * lv_obj_create(lv_obj_t * parent, lv_obj_t * copy)
lv_obj_set_design_func
(
new_obj
,
lv_obj_design
);
lv_obj_set_design_func
(
new_obj
,
lv_obj_design
);
/*Set free data*/
/*Set free data*/
#if
LV_OBJ_FREE_NUM != 0
#if
def LV_OBJ_FREE_NUM_TYPE
new_obj
->
free_num
=
0
;
new_obj
->
free_num
=
0
;
#endif
#endif
#if LV_OBJ_FREE_P != 0
#if LV_OBJ_FREE_P
TR
!= 0
new_obj
->
free_ptr
=
NULL
;
new_obj
->
free_ptr
=
NULL
;
#endif
#endif
...
@@ -184,14 +178,14 @@ lv_obj_t * lv_obj_create(lv_obj_t * parent, lv_obj_t * copy)
...
@@ -184,14 +178,14 @@ lv_obj_t * lv_obj_create(lv_obj_t * parent, lv_obj_t * copy)
new_obj
->
ext_size
=
0
;
new_obj
->
ext_size
=
0
;
/*Set appearance*/
/*Set appearance*/
new_obj
->
style_p
=
&
lv_style_plain
;
new_obj
->
style_p
=
&
lv_style_plain
_color
;
/*Set virtual functions*/
/*Set virtual functions*/
lv_obj_set_signal_func
(
new_obj
,
lv_obj_signal
);
lv_obj_set_signal_func
(
new_obj
,
lv_obj_signal
);
lv_obj_set_design_func
(
new_obj
,
lv_obj_design
);
lv_obj_set_design_func
(
new_obj
,
lv_obj_design
);
/*Set free data*/
/*Set free data*/
#if
LV_OBJ_FREE_NUM != 0
#if
def LV_OBJ_FREE_NUM_TYPE
new_obj
->
free_num
=
0
;
new_obj
->
free_num
=
0
;
#endif
#endif
#if LV_OBJ_FREE_PTR != 0
#if LV_OBJ_FREE_PTR != 0
...
@@ -218,10 +212,10 @@ lv_obj_t * lv_obj_create(lv_obj_t * parent, lv_obj_t * copy)
...
@@ -218,10 +212,10 @@ lv_obj_t * lv_obj_create(lv_obj_t * parent, lv_obj_t * copy)
new_obj
->
ext_size
=
copy
->
ext_size
;
new_obj
->
ext_size
=
copy
->
ext_size
;
/*Set free data*/
/*Set free data*/
#if
LV_OBJ_FREE_NUM != 0
#if
def LV_OBJ_FREE_NUM_TYPE
new_obj
->
free_num
=
copy
->
free_num
;
new_obj
->
free_num
=
copy
->
free_num
;
#endif
#endif
#if LV_OBJ_FREE_P != 0
#if LV_OBJ_FREE_P
TR
!= 0
new_obj
->
free_ptr
=
copy
->
free_ptr
;
new_obj
->
free_ptr
=
copy
->
free_ptr
;
#endif
#endif
/*Set attributes*/
/*Set attributes*/
...
...
lv_core/lv_style.c
View file @
47f2e0a8
...
@@ -131,7 +131,7 @@ void lv_style_init (void)
...
@@ -131,7 +131,7 @@ void lv_style_init (void)
/*Pretty color style*/
/*Pretty color style*/
memcpy
(
&
lv_style_pretty_color
,
&
lv_style_pretty
,
sizeof
(
lv_style_t
));
memcpy
(
&
lv_style_pretty_color
,
&
lv_style_pretty
,
sizeof
(
lv_style_t
));
lv_style_pretty_color
.
text
.
color
=
LV_COLOR_MAKE
(
0x
c0
,
0xc0
,
0xc
0
);
lv_style_pretty_color
.
text
.
color
=
LV_COLOR_MAKE
(
0x
d0
,
0xd0
,
0xd
0
);
lv_style_pretty_color
.
image
.
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
.
line
.
color
=
LV_COLOR_MAKE
(
0xc0
,
0xc0
,
0xc0
);
lv_style_pretty_color
.
body
.
main_color
=
LV_COLOR_MAKE
(
0x6b
,
0x9a
,
0xc7
);
lv_style_pretty_color
.
body
.
main_color
=
LV_COLOR_MAKE
(
0x6b
,
0x9a
,
0xc7
);
...
...
lv_misc/lv_mem.c
View file @
47f2e0a8
...
@@ -352,9 +352,9 @@ static lv_mem_ent_t * ent_trunc(lv_mem_ent_t * e, uint32_t size)
...
@@ -352,9 +352,9 @@ static lv_mem_ent_t * ent_trunc(lv_mem_ent_t * e, uint32_t size)
/* Create the new entry after the current if there is space for it */
/* Create the new entry after the current if there is space for it */
if
(
e
->
header
.
d_size
!=
size
)
{
if
(
e
->
header
.
d_size
!=
size
)
{
uint8_t
*
e_data
=
&
e
->
first_data
;
uint8_t
*
e_data
=
&
e
->
first_data
;
lv_mem_ent_t
*
new_e
=
(
lv_mem_ent_t
*
)
&
e_data
[
size
];
lv_mem_ent_t
*
after_
new_e
=
(
lv_mem_ent_t
*
)
&
e_data
[
size
];
new_e
->
header
.
used
=
0
;
after_
new_e
->
header
.
used
=
0
;
new_e
->
header
.
d_size
=
e
->
header
.
d_size
-
size
-
sizeof
(
lv_mem_header_t
);
after_
new_e
->
header
.
d_size
=
e
->
header
.
d_size
-
size
-
sizeof
(
lv_mem_header_t
);
}
}
/* Set the new size for the original entry */
/* Set the new size for the original entry */
...
...
lv_objx/lv_bar.c
View file @
47f2e0a8
...
@@ -115,7 +115,7 @@ void lv_bar_set_value(lv_obj_t * bar, int16_t value)
...
@@ -115,7 +115,7 @@ void lv_bar_set_value(lv_obj_t * bar, int16_t value)
lv_obj_invalidate
(
bar
);
lv_obj_invalidate
(
bar
);
}
}
#if LV_
USE_ANIM
#if LV_
NO_ANIM == 0
/**
/**
* Set a new value with animation on the bar
* Set a new value with animation on the bar
* @param bar pointer to a bar object
* @param bar pointer to a bar object
...
...
lv_objx/lv_btn.c
View file @
47f2e0a8
...
@@ -364,13 +364,12 @@ static lv_res_t lv_btn_signal(lv_obj_t * btn, lv_signal_t sign, void * param)
...
@@ -364,13 +364,12 @@ static lv_res_t lv_btn_signal(lv_obj_t * btn, lv_signal_t sign, void * param)
}
}
}
else
if
(
c
==
LV_GROUP_KEY_ENTER
)
{
}
else
if
(
c
==
LV_GROUP_KEY_ENTER
)
{
if
(
lv_btn_get_toggle
(
btn
)
!=
false
)
{
if
(
lv_btn_get_toggle
(
btn
)
!=
false
)
{
lv_btn_state_t
state
=
lv_btn_get_state
(
btn
);
if
(
state
==
LV_BTN_STATE_REL
)
lv_btn_set_state
(
btn
,
LV_BTN_STATE_TGL_REL
);
if
(
state
==
LV_BTN_STATE_REL
)
lv_btn_set_state
(
btn
,
LV_BTN_STATE_TGL_REL
);
else
if
(
state
==
LV_BTN_STATE_PR
)
lv_btn_set_state
(
btn
,
LV_BTN_STATE_TGL_PR
);
else
if
(
state
==
LV_BTN_STATE_PR
)
lv_btn_set_state
(
btn
,
LV_BTN_STATE_TGL_PR
);
else
if
(
state
==
LV_BTN_STATE_TGL_REL
)
lv_btn_set_state
(
btn
,
LV_BTN_STATE_REL
);
else
if
(
state
==
LV_BTN_STATE_TGL_REL
)
lv_btn_set_state
(
btn
,
LV_BTN_STATE_REL
);
else
if
(
state
==
LV_BTN_STATE_TGL_PR
)
lv_btn_set_state
(
btn
,
LV_BTN_STATE_PR
);
else
if
(
state
==
LV_BTN_STATE_TGL_PR
)
lv_btn_set_state
(
btn
,
LV_BTN_STATE_PR
);
}
}
if
(
ext
->
actions
[
LV_BTN_ACTION_REL
]
&&
lv_btn_get_state
(
btn
)
!=
LV_BTN_STATE_INA
)
{
if
(
ext
->
actions
[
LV_BTN_ACTION_REL
]
&&
state
!=
LV_BTN_STATE_INA
)
{
res
=
ext
->
actions
[
LV_BTN_ACTION_REL
](
btn
);
res
=
ext
->
actions
[
LV_BTN_ACTION_REL
](
btn
);
}
}
}
}
...
...
lv_objx/lv_btnm.c
View file @
47f2e0a8
...
@@ -562,7 +562,6 @@ static lv_res_t lv_btnm_signal(lv_obj_t * btnm, lv_signal_t sign, void * param)
...
@@ -562,7 +562,6 @@ static lv_res_t lv_btnm_signal(lv_obj_t * btnm, lv_signal_t sign, void * param)
lv_obj_invalidate
(
btnm
);
lv_obj_invalidate
(
btnm
);
}
}
else
if
(
sign
==
LV_SIGNAL_CONTROLL
)
{
else
if
(
sign
==
LV_SIGNAL_CONTROLL
)
{
lv_btnm_ext_t
*
ext
=
lv_obj_get_ext_attr
(
btnm
);
char
c
=
*
((
char
*
)
param
);
char
c
=
*
((
char
*
)
param
);
if
(
c
==
LV_GROUP_KEY_RIGHT
||
c
==
LV_GROUP_KEY_UP
)
{
if
(
c
==
LV_GROUP_KEY_RIGHT
||
c
==
LV_GROUP_KEY_UP
)
{
if
(
ext
->
btn_id_pr
==
LV_BTNM_PR_NONE
)
ext
->
btn_id_pr
=
0
;
if
(
ext
->
btn_id_pr
==
LV_BTNM_PR_NONE
)
ext
->
btn_id_pr
=
0
;
...
...
lv_objx/lv_page.c
View file @
47f2e0a8
...
@@ -94,8 +94,14 @@ lv_obj_t * lv_page_create(lv_obj_t * par, lv_obj_t * copy)
...
@@ -94,8 +94,14 @@ lv_obj_t * lv_page_create(lv_obj_t * par, lv_obj_t * copy)
/*Set the default styles*/
/*Set the default styles*/
lv_theme_t
*
th
=
lv_theme_get_current
();
lv_theme_t
*
th
=
lv_theme_get_current
();
if
(
th
)
{
if
(
th
)
{
lv_page_set_style
(
new_page
,
LV_PAGE_STYLE_BG
,
th
->
page
.
bg
);
if
(
par
==
NULL
){
/*Different styles if it is screen*/
lv_page_set_style
(
new_page
,
LV_PAGE_STYLE_SCRL
,
th
->
page
.
scrl
);
lv_page_set_style
(
new_page
,
LV_PAGE_STYLE_BG
,
th
->
bg
);
lv_page_set_style
(
new_page
,
LV_PAGE_STYLE_SCRL
,
&
lv_style_transp
);
}
else
{
lv_page_set_style
(
new_page
,
LV_PAGE_STYLE_BG
,
th
->
page
.
bg
);
lv_page_set_style
(
new_page
,
LV_PAGE_STYLE_SCRL
,
th
->
page
.
scrl
);
}
lv_page_set_style
(
new_page
,
LV_PAGE_STYLE_SB
,
th
->
page
.
sb
);
lv_page_set_style
(
new_page
,
LV_PAGE_STYLE_SB
,
th
->
page
.
sb
);
}
else
{
}
else
{
lv_page_set_style
(
new_page
,
LV_PAGE_STYLE_BG
,
&
lv_style_pretty_color
);
lv_page_set_style
(
new_page
,
LV_PAGE_STYLE_BG
,
&
lv_style_pretty_color
);
...
...
lv_objx/lv_roller.c
View file @
47f2e0a8
...
@@ -274,7 +274,6 @@ static lv_res_t lv_roller_signal(lv_obj_t * roller, lv_signal_t sign, void * par
...
@@ -274,7 +274,6 @@ static lv_res_t lv_roller_signal(lv_obj_t * roller, lv_signal_t sign, void * par
refr_position
(
roller
,
false
);
refr_position
(
roller
,
false
);
}
}
}
else
if
(
sign
==
LV_SIGNAL_CONTROLL
)
{
}
else
if
(
sign
==
LV_SIGNAL_CONTROLL
)
{
lv_roller_ext_t
*
ext
=
lv_obj_get_ext_attr
(
roller
);
char
c
=
*
((
char
*
)
param
);
char
c
=
*
((
char
*
)
param
);
if
(
c
==
LV_GROUP_KEY_RIGHT
||
c
==
LV_GROUP_KEY_DOWN
)
{
if
(
c
==
LV_GROUP_KEY_RIGHT
||
c
==
LV_GROUP_KEY_DOWN
)
{
if
(
ext
->
ddlist
.
sel_opt_id
+
1
<
ext
->
ddlist
.
option_cnt
)
{
if
(
ext
->
ddlist
.
sel_opt_id
+
1
<
ext
->
ddlist
.
option_cnt
)
{
...
...
lv_objx/lv_slider.c
View file @
47f2e0a8
...
@@ -241,23 +241,27 @@ static bool lv_slider_design(lv_obj_t * slider, const lv_area_t * mask, lv_desig
...
@@ -241,23 +241,27 @@ static bool lv_slider_design(lv_obj_t * slider, const lv_area_t * mask, lv_desig
lv_style_t
*
style_knob
=
lv_slider_get_style
(
slider
,
LV_SLIDER_STYLE_KNOB
);
lv_style_t
*
style_knob
=
lv_slider_get_style
(
slider
,
LV_SLIDER_STYLE_KNOB
);
lv_style_t
*
style_indic
=
lv_slider_get_style
(
slider
,
LV_SLIDER_STYLE_INDIC
);
lv_style_t
*
style_indic
=
lv_slider_get_style
(
slider
,
LV_SLIDER_STYLE_INDIC
);
lv_coord_t
slider_w
=
lv_area_get_width
(
&
slider
->
coords
);
lv_coord_t
slider_h
=
lv_area_get_height
(
&
slider
->
coords
);
/*Draw the bar*/
/*Draw the bar*/
lv_area_t
area_bar
;
lv_area_t
area_bar
;
lv_area_copy
(
&
area_bar
,
&
slider
->
coords
);
lv_area_copy
(
&
area_bar
,
&
slider
->
coords
);
/*Be sure at least vpad/hpad width bar will remain*/
/*Be sure at least vpad/hpad width bar will remain*/
lv_coord_t
pad_ver_bar
=
style_slider
->
body
.
padding
.
ver
;
lv_coord_t
pad_ver_bar
=
style_slider
->
body
.
padding
.
ver
;
lv_coord_t
pad_hor_bar
=
style_slider
->
body
.
padding
.
hor
;
lv_coord_t
pad_hor_bar
=
style_slider
->
body
.
padding
.
hor
;
if
(
pad_ver_bar
*
2
+
LV_SLIDER_SIZE_MIN
>
lv_area_get_height
(
&
area_bar
))
{
if
(
pad_ver_bar
*
2
+
LV_SLIDER_SIZE_MIN
>
lv_area_get_height
(
&
area_bar
))
{
pad_ver_bar
=
(
lv_area_get_height
(
&
area_bar
)
-
LV_SLIDER_SIZE_MIN
)
>>
1
;
pad_ver_bar
=
(
lv_area_get_height
(
&
area_bar
)
-
LV_SLIDER_SIZE_MIN
)
>>
1
;
}
}
if
(
pad_hor_bar
*
2
+
LV_SLIDER_SIZE_MIN
>
lv_area_get_width
(
&
area_bar
))
{
if
(
pad_hor_bar
*
2
+
LV_SLIDER_SIZE_MIN
>
lv_area_get_width
(
&
area_bar
))
{
pad_hor_bar
=
(
lv_area_get_width
(
&
area_bar
)
-
LV_SLIDER_SIZE_MIN
)
>>
1
;
pad_hor_bar
=
(
lv_area_get_width
(
&
area_bar
)
-
LV_SLIDER_SIZE_MIN
)
>>
1
;
}
}
area_bar
.
x1
+=
pad_hor_bar
;
/*Let space only in the perpendicular directions*/
area_bar
.
x2
-=
pad_hor_bar
;
area_bar
.
x1
+=
slider_w
<
slider_h
?
pad_hor_bar
:
0
;
/*Pad only for vertical slider*/
area_bar
.
y1
+=
pad_ver_bar
;
area_bar
.
x2
-=
slider_w
<
slider_h
?
pad_hor_bar
:
0
;
/*Pad only for vertical slider*/
area_bar
.
y2
-=
pad_ver_bar
;
area_bar
.
y1
+=
slider_w
>
slider_h
?
pad_ver_bar
:
0
;
/*Pad only for horizontal slider*/
area_bar
.
y2
-=
slider_w
>
slider_h
?
pad_ver_bar
:
0
;
/*Pad only for horizontal slider*/
lv_draw_rect
(
&
area_bar
,
mask
,
style_slider
);
lv_draw_rect
(
&
area_bar
,
mask
,
style_slider
);
/*Draw the indicator*/
/*Draw the indicator*/
...
@@ -279,8 +283,6 @@ static bool lv_slider_design(lv_obj_t * slider, const lv_area_t * mask, lv_desig
...
@@ -279,8 +283,6 @@ static bool lv_slider_design(lv_obj_t * slider, const lv_area_t * mask, lv_desig
area_indic
.
y1
+=
pad_ver_indic
;
area_indic
.
y1
+=
pad_ver_indic
;
area_indic
.
y2
-=
pad_ver_indic
;
area_indic
.
y2
-=
pad_ver_indic
;
lv_coord_t
slider_w
=
lv_area_get_width
(
&
slider
->
coords
);
lv_coord_t
slider_h
=
lv_area_get_height
(
&
slider
->
coords
);
lv_coord_t
cur_value
=
lv_slider_get_value
(
slider
);
lv_coord_t
cur_value
=
lv_slider_get_value
(
slider
);
lv_coord_t
min_value
=
lv_slider_get_min_value
(
slider
);
lv_coord_t
min_value
=
lv_slider_get_min_value
(
slider
);
...
@@ -415,7 +417,6 @@ static lv_res_t lv_slider_signal(lv_obj_t * slider, lv_signal_t sign, void * par
...
@@ -415,7 +417,6 @@ static lv_res_t lv_slider_signal(lv_obj_t * slider, lv_signal_t sign, void * par
if
(
slider
->
ext_size
<
shadow_w
)
slider
->
ext_size
=
shadow_w
;
if
(
slider
->
ext_size
<
shadow_w
)
slider
->
ext_size
=
shadow_w
;
}
}
}
else
if
(
sign
==
LV_SIGNAL_CONTROLL
)
{
}
else
if
(
sign
==
LV_SIGNAL_CONTROLL
)
{
lv_slider_ext_t
*
ext
=
lv_obj_get_ext_attr
(
slider
);
char
c
=
*
((
char
*
)
param
);
char
c
=
*
((
char
*
)
param
);
if
(
c
==
LV_GROUP_KEY_RIGHT
||
c
==
LV_GROUP_KEY_UP
)
{
if
(
c
==
LV_GROUP_KEY_RIGHT
||
c
==
LV_GROUP_KEY_UP
)
{
lv_slider_set_value
(
slider
,
lv_slider_get_value
(
slider
)
+
1
);
lv_slider_set_value
(
slider
,
lv_slider_get_value
(
slider
)
+
1
);
...
...
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