From 338144caf09c6c806f631a85dc42d6d7c4e8a685 Mon Sep 17 00:00:00 2001 From: fvanroie Date: Sun, 13 Dec 2020 14:20:03 +0100 Subject: [PATCH] Enable pad_inner again in lvgl v7 --- src/hasp_attribute.cpp | 2 +- src/hasp_attribute.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/hasp_attribute.cpp b/src/hasp_attribute.cpp index 5b82c293..2a35ac67 100644 --- a/src/hasp_attribute.cpp +++ b/src/hasp_attribute.cpp @@ -624,7 +624,7 @@ static void hasp_local_style_attr(lv_obj_t * obj, const char * attr_p, uint16_t return attribute_pad_left(obj, part, state, update, attr_p, (lv_style_int_t)var); case ATTR_PAD_RIGHT: return attribute_pad_right(obj, part, state, update, attr_p, (lv_style_int_t)var); -#if 0 +#if LVGL_VERSION_MAJOR == 7 case ATTR_PAD_INNER: return attribute_pad_inner(obj, part, state, update, attr_p, (lv_style_int_t)var); #endif diff --git a/src/hasp_attribute.h b/src/hasp_attribute.h index a8990b3e..74ae2105 100644 --- a/src/hasp_attribute.h +++ b/src/hasp_attribute.h @@ -48,7 +48,9 @@ _HASP_ATTRIBUTE(PAD_TOP, pad_top, lv_style_int_t) _HASP_ATTRIBUTE(PAD_BOTTOM, pad_bottom, lv_style_int_t) _HASP_ATTRIBUTE(PAD_LEFT, pad_left, lv_style_int_t) _HASP_ATTRIBUTE(PAD_RIGHT, pad_right, lv_style_int_t) -//_HASP_ATTRIBUTE(PAD_INNER, pad_inner, lv_style_int_t) +#if LVGL_VERSION_MAJOR == 7 +_HASP_ATTRIBUTE(PAD_INNER, pad_inner, lv_style_int_t) +#endif #if LV_USE_BLEND_MODES _HASP_ATTRIBUTE(BG_BLEND_MODE, bg_blend_mode, lv_blend_mode_t) _HASP_ATTRIBUTE(BORDER_BLEND_MODE, border_blend_mode, lv_blend_mode_t)