Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-28 07:03:00 +08:00
Code Issues Projects Releases Wiki Activity

Realization of extended clickable area.

Browse Source 
Suitable for small lonely objects, which must be clicked.
For activation add "#define USE_LV_EXTENDED_CLICK_AREA 1" to lv_conf.h
This commit is contained in:
melnse 2019-04-03 19:34:58 +03:00
parent 1d986e13df
commit 787dd591c1
3 changed files with 101 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lv_core/lv_indev.c
View File

@ -976,7 +976,11 @@ static lv_obj_t * indev_search_obj(const lv_indev_proc_t * proc, lv_obj_t * obj)
/*If the point is on this object*/
/*Check its children too*/
if(lv_area_is_point_on(&obj->coords, &proc->types.pointer.act_point)) {
#if USE_LV_EXTENDED_CLICK_AREA
if(lv_area_is_point_on(&obj->ext_coords, &proc->act_point)) {
#else
if(lv_area_is_point_on(&obj->coords, &proc->act_point)) {
#endif
lv_obj_t * i;
LV_LL_READ(obj->child_ll, i) {

73
src/lv_core/lv_obj.c
View File

@ -55,6 +55,20 @@ static const void * event_act_data; /*Stores the data passed to the ev
/**********************
* MACROS
**********************/
#if USE_LV_EXTENDED_CLICK_AREA
/**
* Update coordinates of extended clickable area from object's coordinates and ext_paddings
* @param coords coordinates of an object
* @param ext_coords extended coordinates, which will be updated
* @param paddings paddings of extended clickable area
*/
#define UPDATE_EXT_COORDS(coords, ext_coords, paddings) do{\
ext_coords.x1 = paddings.x1 > coords.x1 ? 0 : coords.x1 - paddings.x1; \
ext_coords.x2 = coords.x2 + paddings.x2; \
ext_coords.y1 = paddings.y1 > coords.y1 ? 0 : coords.y1 - paddings.y1; \
ext_coords.y2 = coords.y2 + paddings.y2; \
} while(0)
#endif
/**********************
* GLOBAL FUNCTIONS
@ -147,6 +161,13 @@ lv_obj_t * lv_obj_create(lv_obj_t * parent, const lv_obj_t * copy)
new_obj->coords.y2 = lv_disp_get_ver_res(NULL) - 1;
new_obj->ext_size = 0;
#if USE_LV_EXTENDED_CLICK_AREA
lv_area_copy(&(new_obj->ext_coords), &(new_obj->coords));
new_obj->ext_paddings.x1 = 0;
new_obj->ext_paddings.x2 = 0;
new_obj->ext_paddings.y1 = 0;
new_obj->ext_paddings.y2 = 0;
#endif
/*Init realign*/
#if LV_OBJ_REALIGN
new_obj->realign.align = LV_ALIGN_CENTER;
@ -218,6 +239,13 @@ lv_obj_t * lv_obj_create(lv_obj_t * parent, const lv_obj_t * copy)
LV_OBJ_DEF_HEIGHT;
new_obj->ext_size = 0;
#if USE_LV_EXTENDED_CLICK_AREA
lv_area_copy(&(new_obj->ext_coords), &(new_obj->coords));
new_obj->ext_paddings.x1 = 0;
new_obj->ext_paddings.x2 = 0;
new_obj->ext_paddings.y1 = 0;
new_obj->ext_paddings.y2 = 0;
#endif
/*Init realign*/
#if LV_OBJ_REALIGN
new_obj->realign.align = LV_ALIGN_CENTER;
@ -273,6 +301,11 @@ lv_obj_t * lv_obj_create(lv_obj_t * parent, const lv_obj_t * copy)
lv_area_copy(&new_obj->coords, &copy->coords);
new_obj->ext_size = copy->ext_size;
#if USE_LV_EXTENDED_CLICK_AREA
lv_area_copy(&new_obj->ext_coords, &copy->ext_coords);
lv_area_copy(&new_obj->ext_paddings, &copy->ext_paddings);
#endif
/*Set free data*/
#if LV_USE_USER_DATA_SINGLE
memcpy(&new_obj->user_data, &copy->user_data, sizeof(lv_obj_user_data_t));
@ -559,6 +592,10 @@ void lv_obj_set_pos(lv_obj_t * obj, lv_coord_t x, lv_coord_t y)
obj->coords.x2 += diff.x;
obj->coords.y2 += diff.y;
#if USE_LV_EXTENDED_CLICK_AREA
UPDATE_EXT_COORDS(obj->coords, obj->ext_coords, obj->ext_paddings);
#endif
refresh_children_position(obj, diff.x, diff.y);
/*Inform the object about its new coordinates*/
@ -620,6 +657,9 @@ void lv_obj_set_size(lv_obj_t * obj, lv_coord_t w, lv_coord_t h)
obj->coords.x2 = obj->coords.x1 + w - 1;
obj->coords.y2 = obj->coords.y1 + h - 1;
#if USE_LV_EXTENDED_CLICK_AREA
UPDATE_EXT_COORDS(obj->coords, obj->ext_coords, obj->ext_paddings);
#endif
/*Send a signal to the object with its new coordinates*/
obj->signal_cb(obj, LV_SIGNAL_CORD_CHG, &ori);
@ -643,6 +683,24 @@ void lv_obj_set_size(lv_obj_t * obj, lv_coord_t w, lv_coord_t h)
#endif
}
#if USE_LV_EXTENDED_CLICK_AREA
/**
* 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_paddinds(lv_obj_t * obj, lv_coord_t w, lv_coord_t h)
{
obj->ext_paddings.x1 = w;
obj->ext_paddings.x2 = w;
obj->ext_paddings.y1 = h;
obj->ext_paddings.y2 = h;
UPDATE_EXT_COORDS(obj->coords, obj->ext_coords, obj->ext_paddings);
}
#endif
/**
* Set the width of an object
* @param obj pointer to an object
@ -1571,6 +1629,18 @@ lv_coord_t lv_obj_get_height_fit(lv_obj_t * obj)
return lv_obj_get_width(obj) - style->body.padding.top - style->body.padding.bottom;
}
#if USE_LV_EXTENDED_CLICK_AREA
/**
* Copy the extended clickable area size of an object to an area
* @param obj pointer to an object
* @param cords_p pointer to an area to store the size
*/
void lv_obj_get_ext_paddings(const lv_obj_t * obj, lv_area_t * cords_p)
{
lv_area_copy(cords_p, &obj->ext_paddings);
}
/**
* Get the extended size attribute of an object
* @param obj pointer to an object
@ -1971,6 +2041,9 @@ static void refresh_children_position(lv_obj_t * obj, lv_coord_t x_diff, lv_coor
i->coords.x2 += x_diff;
i->coords.y2 += y_diff;
#if USE_LV_EXTENDED_CLICK_AREA
UPDATE_EXT_COORDS(i->coords, i->ext_coords, i->ext_paddings);
#endif
refresh_children_position(i, x_diff, y_diff);
}
}

23
src/lv_core/lv_obj.h
View File

@ -176,6 +176,10 @@ typedef struct _lv_obj_t
lv_ll_t child_ll; /*Linked list to store the children objects*/
lv_area_t coords; /*Coordinates of the object (x1, y1, x2, y2)*/
#if USE_LV_EXTENDED_CLICK_AREA
lv_area_t ext_coords;
lv_area_t ext_paddings;
#endif
lv_event_cb_t event_cb;
lv_signal_cb_t signal_cb; /*Object type specific signal function*/
@ -337,6 +341,16 @@ void lv_obj_set_y(lv_obj_t * obj, lv_coord_t y);
*/
void lv_obj_set_size(lv_obj_t * obj, lv_coord_t w, lv_coord_t h);
#if USE_LV_EXTENDED_CLICK_AREA
/**
* 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_paddinds(lv_obj_t * obj, lv_coord_t w, lv_coord_t h);
#endif
/**
* Set the width of an object
* @param obj pointer to an object
@ -673,6 +687,15 @@ lv_coord_t lv_obj_get_width_fit(lv_obj_t * obj);
*/
lv_coord_t lv_obj_get_height_fit(lv_obj_t * obj);
#if USE_LV_EXTENDED_CLICK_AREA
/**
* Copy the extended clickable area size of an object to an area
* @param obj pointer to an object
* @param cords_p pointer to an area to store the size
*/
void lv_obj_get_ext_paddings(const lv_obj_t * obj, lv_area_t * cords_p);
#endif
/**
* Get the extended size attribute of an object
* @param obj pointer to an object