github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compile issue with LV_EXT_CLICK_AREA_TINY (#1221)

Browse Source 
Discussed in https://github.com/littlevgl/lv_gui_builder/issues/2#issuecomment-495246128.
This commit is contained in:
crnchbng
2019-10-08 16:53:31 +02:00
committed by embeddedt
parent 2117c4dab2
commit 68c752ab50
1 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/lv_core/lv_obj.c
View File

@@ -21,6 +21,7 @@
#include <stdint.h>
#include <string.h>
#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