Mirrors_UI_SDK/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2026-05-13 07:18:06 +08:00
Code Issues Actions 34 Packages Projects Releases Wiki Activity

minor fixes

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2021-04-23 11:34:59 +02:00
parent eaed66057b
commit a9bedcf335
11 changed files with 118 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/overview/style.md
+87 -328
View File
File diff suppressed because it is too large Load Diff
examples/widgets/btn/lv_example_btn_3.c
+1 -1
View File
@@ -9,7 +9,7 @@ void lv_example_btn_3(void)
{
/*Properties to transition*/
static lv_style_prop_t props[] = {
LV_STYLE_TRANSLATE_WIDTH, LV_STYLE_TRANSLATE_HEIGHT, LV_STYLE_TEXT_LETTER_SPACE, 0
LV_STYLE_TRANSFORM_WIDTH, LV_STYLE_TRANSFORM_HEIGHT, LV_STYLE_TEXT_LETTER_SPACE, 0
};
/*Transition descriptor when going back to the default state.
examples/widgets/imgbtn/lv_example_imgbtn_1.c
+1 -1
View File
@@ -8,7 +8,7 @@ void lv_example_imgbtn_1(void)
LV_IMG_DECLARE(imgbtn_mid);
/*Create a transition animation on width transformation and recolor.*/
static lv_style_prop_t tr_prop[] = {LV_STYLE_TRANSLATE_WIDTH, LV_STYLE_IMG_RECOLOR_OPA, 0};
static lv_style_prop_t tr_prop[] = {LV_STYLE_TRANSFORM_WIDTH, LV_STYLE_IMG_RECOLOR_OPA, 0};
static lv_style_transition_dsc_t tr;
lv_style_transition_dsc_init(&tr, tr_prop, lv_anim_path_linear, 200, 0);
scripts/style_api_gen.py
+5 -1
View File
@@ -384,6 +384,8 @@ def local_style_set(p):
print("}")
print("")
def docs(p):
if "dsc" not in p: return
@@ -398,7 +400,9 @@ def docs(p):
e = "No"
if p["ext_draw"]: e = "Yes"
print("### " + p["name"])
li_style = "style='display:inline; margin-right: 20px"
print("<h3>" + p["name"].lower() + "</h3>")
print(p["dsc"])
print("<ul>")
src/core/lv_disp.c
+1
View File
@@ -145,6 +145,7 @@ void lv_disp_set_theme(lv_disp_t * disp, lv_theme_t * th)
*/
lv_theme_t * lv_disp_get_theme(lv_disp_t * disp)
{
if(disp == NULL) disp = lv_disp_get_default();
return disp->theme;
}
src/core/lv_obj_style.c
+4 -4
View File
@@ -385,10 +385,10 @@ _lv_style_state_cmp_t _lv_obj_style_state_compare(lv_obj_t * obj, lv_state_t sta
}
/*Check for draw pad changes*/
if(lv_style_get_prop(style, LV_STYLE_TRANSLATE_WIDTH, &v)) res = _LV_STYLE_STATE_CMP_DIFF_DRAW_PAD;
else if(lv_style_get_prop(style, LV_STYLE_TRANSLATE_HEIGHT, &v)) res = _LV_STYLE_STATE_CMP_DIFF_DRAW_PAD;
else if(lv_style_get_prop(style, LV_STYLE_TRANSLATE_ANGLE, &v)) res = _LV_STYLE_STATE_CMP_DIFF_DRAW_PAD;
else if(lv_style_get_prop(style, LV_STYLE_TRANSLATE_ZOOM, &v)) res = _LV_STYLE_STATE_CMP_DIFF_DRAW_PAD;
if(lv_style_get_prop(style, LV_STYLE_TRANSFORM_WIDTH, &v)) res = _LV_STYLE_STATE_CMP_DIFF_DRAW_PAD;
else if(lv_style_get_prop(style, LV_STYLE_TRANSFORM_HEIGHT, &v)) res = _LV_STYLE_STATE_CMP_DIFF_DRAW_PAD;
else if(lv_style_get_prop(style, LV_STYLE_TRANSFORM_ANGLE, &v)) res = _LV_STYLE_STATE_CMP_DIFF_DRAW_PAD;
else if(lv_style_get_prop(style, LV_STYLE_TRANSFORM_ZOOM, &v)) res = _LV_STYLE_STATE_CMP_DIFF_DRAW_PAD;
else if(lv_style_get_prop(style, LV_STYLE_OUTLINE_OPA, &v)) res = _LV_STYLE_STATE_CMP_DIFF_DRAW_PAD;
else if(lv_style_get_prop(style, LV_STYLE_OUTLINE_PAD, &v)) res = _LV_STYLE_STATE_CMP_DIFF_DRAW_PAD;
else if(lv_style_get_prop(style, LV_STYLE_SHADOW_WIDTH, &v)) res = _LV_STYLE_STATE_CMP_DIFF_DRAW_PAD;
src/core/lv_obj_style_gen.h
+8 -8
View File
@@ -12,13 +12,13 @@ static inline bool lv_obj_get_style_clip_corner(const struct _lv_obj_t * obj, ui
static inline lv_coord_t lv_obj_get_style_transform_width(const struct _lv_obj_t * obj, uint32_t part)
{
lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_TRANSLATE_WIDTH);
lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_TRANSFORM_WIDTH);
return (lv_coord_t)v.num;
}
static inline lv_coord_t lv_obj_get_style_transform_height(const struct _lv_obj_t * obj, uint32_t part)
{
lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_TRANSLATE_HEIGHT);
lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_TRANSFORM_HEIGHT);
return (lv_coord_t)v.num;
}
@@ -36,13 +36,13 @@ static inline lv_coord_t lv_obj_get_style_translate_y(const struct _lv_obj_t * o
static inline lv_coord_t lv_obj_get_style_transform_zoom(const struct _lv_obj_t * obj, uint32_t part)
{
lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_TRANSLATE_ZOOM);
lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_TRANSFORM_ZOOM);
return (lv_coord_t)v.num;
}
static inline lv_coord_t lv_obj_get_style_transform_angle(const struct _lv_obj_t * obj, uint32_t part)
{
lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_TRANSLATE_ANGLE);
lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_TRANSFORM_ANGLE);
return (lv_coord_t)v.num;
}
@@ -541,7 +541,7 @@ static inline void lv_obj_set_style_transform_width(struct _lv_obj_t * obj, lv_c
lv_style_value_t v = {
.num = (int32_t)value
};
lv_obj_set_local_style_prop(obj, LV_STYLE_TRANSLATE_WIDTH, v, selector);
lv_obj_set_local_style_prop(obj, LV_STYLE_TRANSFORM_WIDTH, v, selector);
}
static inline void lv_obj_set_style_transform_height(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector)
@@ -549,7 +549,7 @@ static inline void lv_obj_set_style_transform_height(struct _lv_obj_t * obj, lv_
lv_style_value_t v = {
.num = (int32_t)value
};
lv_obj_set_local_style_prop(obj, LV_STYLE_TRANSLATE_HEIGHT, v, selector);
lv_obj_set_local_style_prop(obj, LV_STYLE_TRANSFORM_HEIGHT, v, selector);
}
static inline void lv_obj_set_style_translate_x(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector)
@@ -573,7 +573,7 @@ static inline void lv_obj_set_style_transform_zoom(struct _lv_obj_t * obj, lv_co
lv_style_value_t v = {
.num = (int32_t)value
};
lv_obj_set_local_style_prop(obj, LV_STYLE_TRANSLATE_ZOOM, v, selector);
lv_obj_set_local_style_prop(obj, LV_STYLE_TRANSFORM_ZOOM, v, selector);
}
static inline void lv_obj_set_style_transform_angle(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector)
@@ -581,7 +581,7 @@ static inline void lv_obj_set_style_transform_angle(struct _lv_obj_t * obj, lv_c
lv_style_value_t v = {
.num = (int32_t)value
};
lv_obj_set_local_style_prop(obj, LV_STYLE_TRANSLATE_ANGLE, v, selector);
lv_obj_set_local_style_prop(obj, LV_STYLE_TRANSFORM_ANGLE, v, selector);
}
static inline void lv_obj_set_style_opa(struct _lv_obj_t * obj, lv_opa_t value, lv_style_selector_t selector)
src/extra/themes/default/lv_theme_default.c
+2 -2
View File
@@ -199,9 +199,9 @@ static void style_init(void)
{
static const lv_style_prop_t trans_props[] = {
LV_STYLE_BG_OPA, LV_STYLE_BG_COLOR,
LV_STYLE_TRANSLATE_WIDTH, LV_STYLE_TRANSLATE_HEIGHT,
LV_STYLE_TRANSFORM_WIDTH, LV_STYLE_TRANSFORM_HEIGHT,
LV_STYLE_TRANSLATE_Y, LV_STYLE_TRANSLATE_X,
LV_STYLE_TRANSLATE_ZOOM, LV_STYLE_TRANSLATE_ANGLE,
LV_STYLE_TRANSFORM_ZOOM, LV_STYLE_TRANSFORM_ANGLE,
LV_STYLE_COLOR_FILTER_OPA, LV_STYLE_COLOR_FILTER_DSC,
0
};
src/misc/lv_style.c
+1 -1
View File
@@ -211,7 +211,7 @@ lv_style_value_t lv_style_prop_get_default(lv_style_prop_t prop)
{
lv_style_value_t value;
switch(prop) {
case LV_STYLE_TRANSLATE_ZOOM:
case LV_STYLE_TRANSFORM_ZOOM:
value.num = LV_IMG_ZOOM_NONE;
break;
case LV_STYLE_BG_COLOR:
src/misc/lv_style.h
+4 -4
View File
@@ -114,12 +114,12 @@ typedef enum {
/*Group 0*/
LV_STYLE_RADIUS = 1,
LV_STYLE_CLIP_CORNER = 2,
LV_STYLE_TRANSLATE_WIDTH = 3 | LV_STYLE_PROP_EXT_DRAW,
LV_STYLE_TRANSLATE_HEIGHT = 4 | LV_STYLE_PROP_EXT_DRAW,
LV_STYLE_TRANSFORM_WIDTH = 3 | LV_STYLE_PROP_EXT_DRAW,
LV_STYLE_TRANSFORM_HEIGHT = 4 | LV_STYLE_PROP_EXT_DRAW,
LV_STYLE_TRANSLATE_X = 5 | LV_STYLE_PROP_PARENT_LAYOUT_REFR,
LV_STYLE_TRANSLATE_Y = 6 | LV_STYLE_PROP_PARENT_LAYOUT_REFR,
LV_STYLE_TRANSLATE_ZOOM = 7 | LV_STYLE_PROP_EXT_DRAW,
LV_STYLE_TRANSLATE_ANGLE = 8 | LV_STYLE_PROP_EXT_DRAW,
LV_STYLE_TRANSFORM_ZOOM = 7 | LV_STYLE_PROP_EXT_DRAW,
LV_STYLE_TRANSFORM_ANGLE = 8 | LV_STYLE_PROP_EXT_DRAW,
LV_STYLE_OPA = 9 | LV_STYLE_PROP_INHERIT,
LV_STYLE_COLOR_FILTER_DSC = 10,
src/misc/lv_style_gen.h
+4 -4
View File
@@ -19,7 +19,7 @@ static inline void lv_style_set_transform_width(lv_style_t * style, lv_coord_t v
lv_style_value_t v = {
.num = (int32_t)value
};
lv_style_set_prop(style, LV_STYLE_TRANSLATE_WIDTH, v);
lv_style_set_prop(style, LV_STYLE_TRANSFORM_WIDTH, v);
}
static inline void lv_style_set_transform_height(lv_style_t * style, lv_coord_t value)
@@ -27,7 +27,7 @@ static inline void lv_style_set_transform_height(lv_style_t * style, lv_coord_t
lv_style_value_t v = {
.num = (int32_t)value
};
lv_style_set_prop(style, LV_STYLE_TRANSLATE_HEIGHT, v);
lv_style_set_prop(style, LV_STYLE_TRANSFORM_HEIGHT, v);
}
static inline void lv_style_set_translate_x(lv_style_t * style, lv_coord_t value)
@@ -51,7 +51,7 @@ static inline void lv_style_set_transform_zoom(lv_style_t * style, lv_coord_t va
lv_style_value_t v = {
.num = (int32_t)value
};
lv_style_set_prop(style, LV_STYLE_TRANSLATE_ZOOM, v);
lv_style_set_prop(style, LV_STYLE_TRANSFORM_ZOOM, v);
}
static inline void lv_style_set_transform_angle(lv_style_t * style, lv_coord_t value)
@@ -59,7 +59,7 @@ static inline void lv_style_set_transform_angle(lv_style_t * style, lv_coord_t v
lv_style_value_t v = {
.num = (int32_t)value
};
lv_style_set_prop(style, LV_STYLE_TRANSLATE_ANGLE, v);
lv_style_set_prop(style, LV_STYLE_TRANSFORM_ANGLE, v);
}
static inline void lv_style_set_opa(lv_style_t * style, lv_opa_t value)