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

fix build error

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi 2020-12-30 14:20:06 +01:00
parent a7f9508ec4
commit 56159d60a0
2 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/lv_core/lv_style.c
View File

@ -179,12 +179,6 @@ uint32_t lv_style_find_index_num(lv_style_value_t v)
return 0; return 0;
} }
int32_t lv_style_get_indexed_num(uint32_t id)
{
return buf_num[id];
}
uint32_t lv_style_find_index_color(lv_style_value_t v) uint32_t lv_style_find_index_color(lv_style_value_t v)
{ {
uint32_t i; uint32_t i;
@ -194,12 +188,6 @@ uint32_t lv_style_find_index_color(lv_style_value_t v)
return 0; return 0;
} }
lv_color_t lv_style_get_indexed_color(uint32_t id)
{
return buf_color[id];
}
uint32_t lv_style_find_index_ptr(lv_style_value_t v) uint32_t lv_style_find_index_ptr(lv_style_value_t v)
{ {
uint32_t i; uint32_t i;
@ -209,26 +197,23 @@ uint32_t lv_style_find_index_ptr(lv_style_value_t v)
return 0; return 0;
} }
int32_t lv_style_get_indexed_ptr(uint32_t id) int32_t lv_style_get_indexed_num(uint32_t id)
{ {
return buf_ptr[id]; return buf_num[id];
} }
uint32_t lv_style_find_index_color(lv_style_value_t v)
{
uint32_t i;
for(i = 1; i < buf_color_p; i++) {
if(v._color.full == buf_color[i].full) return i;
}
return 0;
}
lv_color_t lv_style_get_indexed_color(uint32_t id) lv_color_t lv_style_get_indexed_color(uint32_t id)
{ {
return buf_color[id]; return buf_color[id];
} }
const void * lv_style_get_indexed_ptr(uint32_t id)
{
return buf_ptr[id];
}
/** /**
* Check whether a style is valid (initialized correctly) * Check whether a style is valid (initialized correctly)

6
src/lv_core/lv_style.h
View File

@ -728,11 +728,11 @@ lv_style_value_t lv_style_prop_get_default(lv_style_prop_t prop);
uint32_t lv_style_find_index_num(lv_style_value_t v); uint32_t lv_style_find_index_num(lv_style_value_t v);
int32_t lv_style_get_indexed_num(uint32_t id);
uint32_t lv_style_find_index_color(lv_style_value_t v); uint32_t lv_style_find_index_color(lv_style_value_t v);
lv_color_t lv_style_get_indexed_color(uint32_t id);
uint32_t lv_style_find_index_ptr(lv_style_value_t v); uint32_t lv_style_find_index_ptr(lv_style_value_t v);
int32_t lv_style_get_indexed_ptr(uint32_t id); int32_t lv_style_get_indexed_num(uint32_t id);
lv_color_t lv_style_get_indexed_color(uint32_t id);
const void * lv_style_get_indexed_ptr(uint32_t id);
/** /**
* Check whether a style is valid (initialized correctly) * Check whether a style is valid (initialized correctly)