Upstream/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-21 11:37:27 +01:00
Code Issues Projects Releases Wiki Activity

[lvgl] Some properties were not templatable (Bugfix) (#7655)

Browse Source
This commit is contained in:
Clyde Stubbs 2024-10-23 10:16:55 +11:00 committed by GitHub
parent 7c0543862a
commit 68844c4869
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
esphome/components/lvgl/lv_validation.py
View File

@ -267,6 +267,9 @@ def angle(value):
return int(cv.float_range(0.0, 360.0)(cv.angle(value)) * 10) return int(cv.float_range(0.0, 360.0)(cv.angle(value)) * 10)
lv_angle = LValidator(angle, uint32)
@schema_extractor("one_of") @schema_extractor("one_of")
def size_validator(value): def size_validator(value):
"""A size in one axis - one of "size_content", a number (pixels) or a percentage""" """A size in one axis - one of "size_content", a number (pixels) or a percentage"""
@ -401,6 +404,7 @@ class TextValidator(LValidator):
lv_text = TextValidator() lv_text = TextValidator()
lv_float = LValidator(cv.float_, cg.float_) lv_float = LValidator(cv.float_, cg.float_)
lv_int = LValidator(cv.int_, cg.int_) lv_int = LValidator(cv.int_, cg.int_)
lv_positive_int = LValidator(cv.positive_int, cg.int_)
lv_brightness = LValidator(cv.percentage, cg.float_, retmapper=lambda x: int(x * 255)) lv_brightness = LValidator(cv.percentage, cg.float_, retmapper=lambda x: int(x * 255))

14
esphome/components/lvgl/schemas.py
View File

@ -91,7 +91,7 @@ STYLE_PROPS = {
"arc_opa": lvalid.opacity, "arc_opa": lvalid.opacity,
"arc_color": lvalid.lv_color, "arc_color": lvalid.lv_color,
"arc_rounded": lvalid.lv_bool, "arc_rounded": lvalid.lv_bool,
"arc_width": cv.positive_int, "arc_width": lvalid.lv_positive_int,
"anim_time": lvalid.lv_milliseconds, "anim_time": lvalid.lv_milliseconds,
"bg_color": lvalid.lv_color, "bg_color": lvalid.lv_color,
"bg_grad": lv_gradient, "bg_grad": lv_gradient,
@ -111,7 +111,7 @@ STYLE_PROPS = {
"border_side": df.LvConstant( "border_side": df.LvConstant(
"LV_BORDER_SIDE_", "NONE", "TOP", "BOTTOM", "LEFT", "RIGHT", "INTERNAL" "LV_BORDER_SIDE_", "NONE", "TOP", "BOTTOM", "LEFT", "RIGHT", "INTERNAL"
).several_of, ).several_of,
"border_width": cv.positive_int, "border_width": lvalid.lv_positive_int,
"clip_corner": lvalid.lv_bool, "clip_corner": lvalid.lv_bool,
"color_filter_opa": lvalid.opacity, "color_filter_opa": lvalid.opacity,
"height": lvalid.size, "height": lvalid.size,
@ -134,11 +134,11 @@ STYLE_PROPS = {
"pad_right": lvalid.pixels, "pad_right": lvalid.pixels,
"pad_top": lvalid.pixels, "pad_top": lvalid.pixels,
"shadow_color": lvalid.lv_color, "shadow_color": lvalid.lv_color,
"shadow_ofs_x": cv.int_, "shadow_ofs_x": lvalid.lv_int,
"shadow_ofs_y": cv.int_, "shadow_ofs_y": lvalid.lv_int,
"shadow_opa": lvalid.opacity, "shadow_opa": lvalid.opacity,
"shadow_spread": cv.int_, "shadow_spread": lvalid.lv_int,
"shadow_width": cv.positive_int, "shadow_width": lvalid.lv_positive_int,
"text_align": df.LvConstant( "text_align": df.LvConstant(
"LV_TEXT_ALIGN_", "LEFT", "CENTER", "RIGHT", "AUTO" "LV_TEXT_ALIGN_", "LEFT", "CENTER", "RIGHT", "AUTO"
).one_of, ).one_of,
@ -150,7 +150,7 @@ STYLE_PROPS = {
"text_letter_space": cv.positive_int, "text_letter_space": cv.positive_int,
"text_line_space": cv.positive_int, "text_line_space": cv.positive_int,
"text_opa": lvalid.opacity, "text_opa": lvalid.opacity,
"transform_angle": lvalid.angle, "transform_angle": lvalid.lv_angle,
"transform_height": lvalid.pixels_or_percent, "transform_height": lvalid.pixels_or_percent,
"transform_pivot_x": lvalid.pixels_or_percent, "transform_pivot_x": lvalid.pixels_or_percent,
"transform_pivot_y": lvalid.pixels_or_percent, "transform_pivot_y": lvalid.pixels_or_percent,

7
tests/components/lvgl/lvgl-package.yaml
View File

@ -323,6 +323,13 @@ lvgl:
id: button_button id: button_button
width: 20% width: 20%
height: 10% height: 10%
transform_angle: !lambda return 180*100;
arc_width: !lambda return 4;
border_width: !lambda return 6;
shadow_ofs_x: !lambda return 6;
shadow_ofs_y: !lambda return 6;
shadow_spread: !lambda return 6;
shadow_width: !lambda return 6;
pressed: pressed:
bg_color: light_blue bg_color: light_blue
checkable: true checkable: true