diff options
Diffstat (limited to 'src/core/lv_obj_draw.c')
| -rw-r--r-- | src/core/lv_obj_draw.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/core/lv_obj_draw.c b/src/core/lv_obj_draw.c index 12a78ff31..d6dde65b1 100644 --- a/src/core/lv_obj_draw.c +++ b/src/core/lv_obj_draw.c @@ -250,35 +250,35 @@ void lv_obj_init_draw_arc_dsc(lv_obj_t * obj, uint32_t part, lv_draw_arc_dsc_t * draw_dsc->rounded = lv_obj_get_style_arc_rounded(obj, part); } -lv_coord_t lv_obj_calculate_ext_draw_size(lv_obj_t * obj, uint32_t part) +int32_t lv_obj_calculate_ext_draw_size(lv_obj_t * obj, uint32_t part) { - lv_coord_t s = 0; + int32_t s = 0; - lv_coord_t sh_width = lv_obj_get_style_shadow_width(obj, part); + int32_t sh_width = lv_obj_get_style_shadow_width(obj, part); if(sh_width) { lv_opa_t sh_opa = lv_obj_get_style_shadow_opa(obj, part); if(sh_opa > LV_OPA_MIN) { sh_width = sh_width / 2 + 1; /*The blur adds only half width*/ sh_width += lv_obj_get_style_shadow_spread(obj, part); - lv_coord_t sh_ofs_x = lv_obj_get_style_shadow_offset_x(obj, part); - lv_coord_t sh_ofs_y = lv_obj_get_style_shadow_offset_y(obj, part); + int32_t sh_ofs_x = lv_obj_get_style_shadow_offset_x(obj, part); + int32_t sh_ofs_y = lv_obj_get_style_shadow_offset_y(obj, part); sh_width += LV_MAX(LV_ABS(sh_ofs_x), LV_ABS(sh_ofs_y)); s = LV_MAX(s, sh_width); } } - lv_coord_t outline_width = lv_obj_get_style_outline_width(obj, part); + int32_t outline_width = lv_obj_get_style_outline_width(obj, part); if(outline_width) { lv_opa_t outline_opa = lv_obj_get_style_outline_opa(obj, part); if(outline_opa > LV_OPA_MIN) { - lv_coord_t outline_pad = lv_obj_get_style_outline_pad(obj, part); + int32_t outline_pad = lv_obj_get_style_outline_pad(obj, part); s = LV_MAX(s, outline_pad + outline_width); } } - lv_coord_t w = lv_obj_get_style_transform_width(obj, part); - lv_coord_t h = lv_obj_get_style_transform_height(obj, part); - lv_coord_t wh = LV_MAX(w, h); + int32_t w = lv_obj_get_style_transform_width(obj, part); + int32_t h = lv_obj_get_style_transform_height(obj, part); + int32_t wh = LV_MAX(w, h); if(wh > 0) s += wh; return s; @@ -288,8 +288,8 @@ void lv_obj_refresh_ext_draw_size(lv_obj_t * obj) { LV_ASSERT_OBJ(obj, MY_CLASS); - lv_coord_t s_old = _lv_obj_get_ext_draw_size(obj); - lv_coord_t s_new = 0; + int32_t s_old = _lv_obj_get_ext_draw_size(obj); + int32_t s_new = 0; lv_obj_send_event(obj, LV_EVENT_REFR_EXT_DRAW_SIZE, &s_new); if(s_new != s_old) lv_obj_invalidate(obj); @@ -308,7 +308,7 @@ void lv_obj_refresh_ext_draw_size(lv_obj_t * obj) if(s_new != s_old) lv_obj_invalidate(obj); } -lv_coord_t _lv_obj_get_ext_draw_size(const lv_obj_t * obj) +int32_t _lv_obj_get_ext_draw_size(const lv_obj_t * obj) { if(obj->spec_attr) return obj->spec_attr->ext_draw_size; else return 0; |