From e9d2191463cb4425ad9f07d90f19b751190ff1d3 Mon Sep 17 00:00:00 2001 From: Themba Dube Date: Sat, 20 Apr 2019 09:07:54 -0400 Subject: [PATCH] Remove lv_area_ext_is_point_on --- src/lv_misc/lv_area.c | 23 ----------------------- src/lv_misc/lv_area.h | 16 ---------------- 2 files changed, 39 deletions(-) diff --git a/src/lv_misc/lv_area.c b/src/lv_misc/lv_area.c index c2084e4e4..e890bb7b0 100644 --- a/src/lv_misc/lv_area.c +++ b/src/lv_misc/lv_area.c @@ -154,29 +154,6 @@ bool lv_area_is_point_on(const lv_area_t * a_p, const lv_point_t * p_p) return is_on; } -#if LV_USE_EXT_CLICK_AREA == LV_EXT_CLICK_AREA_TINY -/** - * Check if a point is on an area - * @param a_p pointer to an area - * @param p_p pointer to a point - * @param ext_hor extended horizontal padding - * @param ext_ver extended horizontal padding - * @return false:the point is out of the area - */ -bool lv_area_ext_is_point_on(const lv_area_t * a_p, const lv_point_t * p_p, uint8_t ext_hor, uint8_t ext_ver) -{ - bool is_on = false; - - if(( (p_p->x + ext_hor) >= a_p->x1 && p_p->x <= (a_p->x2 + ext_hor) ) && - ( (p_p->y + ext_ver) >= a_p->y1 && p_p->y <= (a_p->y2 + ext_ver)) ) { - is_on = true; - } - - return is_on; -} - -#endif - /** * Check if two area has common parts * @param a1_p pointer to an area. diff --git a/src/lv_misc/lv_area.h b/src/lv_misc/lv_area.h index 008356d98..133f4bcac 100644 --- a/src/lv_misc/lv_area.h +++ b/src/lv_misc/lv_area.h @@ -28,10 +28,6 @@ extern "C" { #define LV_COORD_MAX (16383) /*To avoid overflow don't let the max [-32,32k] range */ #define LV_COORD_MIN (-16384) -#define LV_EXT_CLICK_AREA_OFF 0 -#define LV_EXT_CLICK_AREA_TINY 1 -#define LV_EXT_CLICK_AREA_FULL 2 - /********************** * TYPEDEFS **********************/ @@ -149,18 +145,6 @@ void lv_area_join(lv_area_t * a_res_p, const lv_area_t * a1_p, const lv_area_t * */ bool lv_area_is_point_on(const lv_area_t * a_p, const lv_point_t * p_p); -#if LV_USE_EXT_CLICK_AREA == LV_EXT_CLICK_AREA_TINY -/** - * Check if a point is on an area - * @param a_p pointer to an area - * @param p_p pointer to a point - * @param ext_hor extended horizontal padding - * @param ext_ver extended horizontal padding - * @return false:the point is out of the area - */ -bool lv_area_ext_is_point_on(const lv_area_t * a_p, const lv_point_t * p_p, uint8_t ext_hor, uint8_t ext_ver); -#endif - /** * Check if two area has common parts * @param a1_p pointer to an area.