diff --git a/src/lv_core/lv_obj.c b/src/lv_core/lv_obj.c index ac9421a28..49aef0d4b 100644 --- a/src/lv_core/lv_obj.c +++ b/src/lv_core/lv_obj.c @@ -22,6 +22,7 @@ #include #include #include "../lv_misc/lv_gc.h" +#include "../lv_misc/lv_math.h" #if defined(LV_GC_INCLUDE) #include LV_GC_INCLUDE @@ -1115,21 +1116,6 @@ void lv_obj_set_auto_realign(lv_obj_t * obj, bool en) #endif } -#if LV_USE_EXT_CLICK_AREA == LV_EXT_CLICK_AREA_TINY -/** - * Set the size of an extended clickable area - * @param obj pointer to an object - * @param w extended width to both sides - * @param h extended height to both sides - */ -void lv_obj_set_ext_click_area(lv_obj_t * obj, uint8_t w, uint8_t h) -{ - LV_ASSERT_OBJ(obj, LV_OBJX_NAME); - - obj->ext_click_pad_hor = w; - obj->ext_click_pad_ver = h; -} -#endif /** * Set the size of an extended clickable area @@ -1913,7 +1899,7 @@ lv_coord_t lv_obj_get_ext_click_pad_bottom(const lv_obj_t * obj) LV_ASSERT_OBJ(obj, LV_OBJX_NAME); #if LV_USE_EXT_CLICK_AREA == LV_EXT_CLICK_AREA_TINY - return obj->ext_click_pad_ver + return obj->ext_click_pad_ver; #elif LV_USE_EXT_CLICK_AREA == LV_EXT_CLICK_AREA_FULL return obj->ext_click_pad.y2; #else diff --git a/src/lv_objx/lv_btn.c b/src/lv_objx/lv_btn.c index e0e70222c..fa7880ef5 100644 --- a/src/lv_objx/lv_btn.c +++ b/src/lv_objx/lv_btn.c @@ -363,7 +363,7 @@ uint16_t lv_btn_get_ink_out_time(const lv_obj_t * btn) #if LV_USE_ANIMATION && LV_BTN_INK_EFFECT lv_btn_ext_t * ext = lv_obj_get_ext_attr(btn); - return ext->ink_in_time; + return ext->ink_out_time; #else (void)btn; /*Unused*/ return 0;