From 2117c4dab28da95ef5b22d025501c710a601bf6d Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Tue, 8 Oct 2019 06:04:58 +0200 Subject: [PATCH 1/2] fix lv_btn_get_ink_out_time --- src/lv_objx/lv_btn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lv_objx/lv_btn.c b/src/lv_objx/lv_btn.c index 7ab3e5b25..c304fb526 100644 --- a/src/lv_objx/lv_btn.c +++ b/src/lv_objx/lv_btn.c @@ -337,7 +337,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; From 68c752ab5097433bba30fd08723f0d2fae288f1f Mon Sep 17 00:00:00 2001 From: crnchbng <45542295+crnchbng@users.noreply.github.com> Date: Tue, 8 Oct 2019 16:53:31 +0200 Subject: [PATCH 2/2] Fix compile issue with LV_EXT_CLICK_AREA_TINY (#1221) Discussed in https://github.com/littlevgl/lv_gui_builder/issues/2#issuecomment-495246128. --- src/lv_core/lv_obj.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/src/lv_core/lv_obj.c b/src/lv_core/lv_obj.c index e0ad6c42c..dd48b5af6 100644 --- a/src/lv_core/lv_obj.c +++ b/src/lv_core/lv_obj.c @@ -21,6 +21,7 @@ #include #include #include "../lv_misc/lv_gc.h" +#include "../lv_misc/lv_math.h" #if defined(LV_GC_INCLUDE) #include LV_GC_INCLUDE @@ -1073,20 +1074,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) -{ - obj->ext_click_pad_hor = w; - obj->ext_click_pad_ver = h; -} -#endif - /** * Set the size of an extended clickable area * If TINY mode is used, only the largest of the horizontal and vertical padding @@ -1780,7 +1767,7 @@ lv_coord_t lv_obj_get_ext_click_pad_top(const lv_obj_t * obj) lv_coord_t lv_obj_get_ext_click_pad_bottom(const lv_obj_t * obj) { #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