github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

style: minor fix on getting style attributes + formatting

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2020-06-24 10:45:32 +02:00
parent e2aa68394c
commit 8f243c01d5
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lv_core/lv_style.c
View File

@@ -557,7 +557,7 @@ int16_t _lv_style_get_int(const lv_style_t * style, lv_style_property_t prop, vo
else { else {
_lv_memcpy_small(res, &style->map[id + sizeof(lv_style_property_t)], sizeof(lv_style_int_t)); _lv_memcpy_small(res, &style->map[id + sizeof(lv_style_property_t)], sizeof(lv_style_int_t));
lv_style_attr_t attr_act; lv_style_attr_t attr_act;
attr_act = get_style_prop_attr(style, id + 1); attr_act = get_style_prop_attr(style, id);
lv_style_attr_t attr_goal; lv_style_attr_t attr_goal;
attr_goal = (prop >> 8) & 0xFF; attr_goal = (prop >> 8) & 0xFF;

4
src/lv_core/lv_style.h
View File

@@ -83,8 +83,8 @@ typedef uint8_t lv_text_decor_t;
typedef uint8_t lv_style_attr_t; typedef uint8_t lv_style_attr_t;
#define LV_STYLE_ATTR_GET_INHERIT(f) ((f)&0xA0) #define LV_STYLE_ATTR_GET_INHERIT(f) ((f)&0x80)
#define LV_STYLE_ATTR_GET_STATE(f) ((f)&0x3F) #define LV_STYLE_ATTR_GET_STATE(f) ((f)&0x7F)
#define LV_STYLE_ID_VALUE 0x0 /*max 9 pcs*/ #define LV_STYLE_ID_VALUE 0x0 /*max 9 pcs*/
#define LV_STYLE_ID_COLOR 0x9 /*max 3 pcs*/ #define LV_STYLE_ID_COLOR 0x9 /*max 3 pcs*/