summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorailurux <ailuruxx@gmail.com>2024-03-27 15:41:22 +1100
committerailurux <ailuruxx@gmail.com>2024-03-27 15:41:22 +1100
commit223c4cbbc91ca6727dd1ceb076640e59bb6ec25b (patch)
tree7bee36a17afa64481aaa959c71b9712a26cd89c0
parentf29d31d01c26ee0cb175e44ac4096e5904c282cd (diff)
downloadtangara-fw-223c4cbbc91ca6727dd1ceb076640e59bb6ec25b.tar.gz
Allow image recoloring properties to be inherited by children
-rw-r--r--lib/lvgl/src/misc/lv_style.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/lvgl/src/misc/lv_style.c b/lib/lvgl/src/misc/lv_style.c
index 419c29e4..baf135ad 100644
--- a/lib/lvgl/src/misc/lv_style.c
+++ b/lib/lvgl/src/misc/lv_style.c
@@ -92,9 +92,11 @@ const uint8_t _lv_style_builtin_prop_flag_lookup_table[_LV_STYLE_NUM_BUILT_IN_PR
[LV_STYLE_SHADOW_COLOR] = 0,
[LV_STYLE_SHADOW_OPA] = LV_STYLE_PROP_EXT_DRAW,
- [LV_STYLE_IMG_OPA] = 0,
- [LV_STYLE_IMG_RECOLOR] = 0,
- [LV_STYLE_IMG_RECOLOR_OPA] = 0,
+ // Image style inheritance
+ // https://github.com/lvgl/lvgl/pull/4664
+ [LV_STYLE_IMG_OPA] = LV_STYLE_PROP_INHERIT,
+ [LV_STYLE_IMG_RECOLOR] = LV_STYLE_PROP_INHERIT,
+ [LV_STYLE_IMG_RECOLOR_OPA] = LV_STYLE_PROP_INHERIT,
[LV_STYLE_LINE_WIDTH] = LV_STYLE_PROP_EXT_DRAW,
[LV_STYLE_LINE_DASH_WIDTH] = 0,