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

change custom drawer to event

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2021-01-21 15:18:20 +01:00
parent c64810dac4
commit 1d6d2eb9d9
47 changed files with 758 additions and 2314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/lv_widgets/lv_dropdown.c
View File

@@ -42,8 +42,8 @@
**********************/
static void lv_dropdown_constructor(lv_obj_t * obj, lv_obj_t * parent, const lv_obj_t * copy);
static void lv_dropdown_destructor(void * obj);
static lv_drawer_res_t lv_dropdown_drawer(lv_obj_t * obj, const lv_area_t * clip_area, lv_drawer_mode_t mode);
static lv_drawer_res_t lv_dropdown_list_drawer(lv_obj_t * obj, const lv_area_t * clip_area, lv_drawer_mode_t mode);
static lv_draw_res_t lv_dropdown_draw(lv_obj_t * obj, const lv_area_t * clip_area, lv_draw_mode_t mode);
static lv_draw_res_t lv_dropdown_list_draw(lv_obj_t * obj, const lv_area_t * clip_area, lv_draw_mode_t mode);
static lv_res_t lv_dropdown_signal(lv_obj_t * obj, lv_signal_t sign, void * param);
static lv_res_t lv_dropdown_list_signal(lv_obj_t * list, lv_signal_t sign, void * param);
static void draw_box(lv_obj_t * dropdown_obj, const lv_area_t * clip_area, uint16_t id, lv_state_t state);
@@ -82,7 +82,7 @@ lv_obj_t * lv_dropdown_create(lv_obj_t * parent, const lv_obj_t * copy)
LV_CLASS_INIT(lv_dropdown, lv_obj);
lv_dropdown.constructor = lv_dropdown_constructor;
lv_dropdown.destructor = lv_dropdown_destructor;
lv_dropdown.drawer_cb = lv_dropdown_drawer;
lv_dropdown.draw_cb = lv_dropdown_draw;
lv_dropdown.signal_cb = lv_dropdown_signal;
}
@@ -601,7 +601,7 @@ lv_obj_t * lv_dropdown_list_create(lv_obj_t * parent, const lv_obj_t * copy)
LV_CLASS_INIT(lv_dropdown_list, lv_obj);
lv_dropdown_list.constructor = lv_obj.constructor;
lv_dropdown_list.destructor = lv_obj.destructor;
lv_dropdown_list.drawer_cb = lv_dropdown_list_drawer;
lv_dropdown_list.draw_cb = lv_dropdown_list_draw;
lv_dropdown_list.signal_cb = lv_dropdown_list_signal;
}
@@ -681,21 +681,21 @@ static void lv_dropdown_destructor(void * obj)
* Handle the drawing related tasks of the drop down list
* @param ddlist pointer to an object
* @param clip_area the object will be drawn only in this area
* @param mode LV_DRAWER_COVER_CHK: only check if the object fully covers the 'mask_p' area
* @param mode LV_DRAW_COVER_CHK: only check if the object fully covers the 'mask_p' area
* (return 'true' if yes)
* LV_DRAWER_DRAW: draw the object (always return 'true')
* LV_DRAWER_DRAW_POST: drawing after every children are drawn
* @param return an element of `lv_drawer_res_t`
* LV_DRAW_DRAW: draw the object (always return 'true')
* LV_DRAW_DRAW_POST: drawing after every children are drawn
* @param return an element of `lv_draw_res_t`
*/
static lv_drawer_res_t lv_dropdown_drawer(lv_obj_t * obj, const lv_area_t * clip_area, lv_drawer_mode_t mode)
static lv_draw_res_t lv_dropdown_draw(lv_obj_t * obj, const lv_area_t * clip_area, lv_draw_mode_t mode)
{
/*Return false if the object is not covers the mask_p area*/
if(mode == LV_DRAWER_COVER_CHK) {
return lv_obj.drawer_cb(obj, clip_area, mode);
if(mode == LV_DRAW_COVER_CHK) {
return lv_obj.draw_cb(obj, clip_area, mode);
}
/*Draw the object*/
else if(mode == LV_DRAWER_DRAW_MAIN) {
lv_obj.drawer_cb(obj, clip_area, mode);
else if(mode == LV_DRAW_DRAW_MAIN) {
lv_obj.draw_cb(obj, clip_area, mode);
lv_dropdown_t * dropdown = (lv_dropdown_t *) obj;
@@ -770,32 +770,32 @@ static lv_drawer_res_t lv_dropdown_drawer(lv_obj_t * obj, const lv_area_t * clip
}
}
else if(mode == LV_DRAWER_DRAW_POST) {
lv_obj.drawer_cb(obj, clip_area, mode);
else if(mode == LV_DRAW_DRAW_POST) {
lv_obj.draw_cb(obj, clip_area, mode);
}
return LV_DRAWER_RES_OK;
return LV_DRAW_RES_OK;
}
/**
* Handle the drawing related tasks of the drop down list's list
* @param list pointer to an object
* @param clip_area the object will be drawn only in this area
* @param mode LV_DRAWER_COVER_CHK: only check if the object fully covers the 'mask_p' area
* @param mode LV_DRAW_COVER_CHK: only check if the object fully covers the 'mask_p' area
* (return 'true' if yes)
* LV_DRAWER_DRAW: draw the object (always return 'true')
* LV_DRAWER_DRAW_POST: drawing after every children are drawn
* @param return an element of `lv_drawer_res_t`
* LV_DRAW_DRAW: draw the object (always return 'true')
* LV_DRAW_DRAW_POST: drawing after every children are drawn
* @param return an element of `lv_draw_res_t`
*/
static lv_drawer_res_t lv_dropdown_list_drawer(lv_obj_t * list_obj, const lv_area_t * clip_area, lv_drawer_mode_t mode)
static lv_draw_res_t lv_dropdown_list_draw(lv_obj_t * list_obj, const lv_area_t * clip_area, lv_draw_mode_t mode)
{
/*Return false if the object is not covers the mask_p area*/
if(mode == LV_DRAWER_COVER_CHK) {
return lv_obj.drawer_cb(list_obj, clip_area, mode);
if(mode == LV_DRAW_COVER_CHK) {
return lv_obj.draw_cb(list_obj, clip_area, mode);
}
/*Draw the object*/
else if(mode == LV_DRAWER_DRAW_MAIN) {
lv_obj.drawer_cb(list_obj, clip_area, mode);
else if(mode == LV_DRAW_DRAW_MAIN) {
lv_obj.draw_cb(list_obj, clip_area, mode);
lv_dropdown_list_t * list = (lv_dropdown_list_t *)list_obj;
lv_obj_t * dropdown_obj = list->dropdown;
@@ -818,8 +818,8 @@ static lv_drawer_res_t lv_dropdown_list_drawer(lv_obj_t * list_obj, const lv_are
}
}
/*Post draw when the children are drawn*/
else if(mode == LV_DRAWER_DRAW_POST) {
lv_obj.drawer_cb(list_obj, clip_area, mode);
else if(mode == LV_DRAW_DRAW_POST) {
lv_obj.draw_cb(list_obj, clip_area, mode);
lv_dropdown_list_t * list = (lv_dropdown_list_t *)list_obj;
lv_obj_t * dropdown_obj = list->dropdown;
@@ -842,7 +842,7 @@ static lv_drawer_res_t lv_dropdown_list_drawer(lv_obj_t * list_obj, const lv_are
}
}
return LV_DRAWER_RES_OK;
return LV_DRAW_RES_OK;
}
/**