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

dispi->indev rework and integration

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2017-10-09 15:21:26 +02:00
parent 71c5c5814c
commit a5c85244a7
39 changed files with 808 additions and 817 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lv_examples/1_2_objects/lv_ex_objects.c
View File

@@ -73,8 +73,8 @@
/**********************
* STATIC PROTOTYPES
**********************/
static lv_action_res_t btn_rel_action(lv_obj_t * btn, lv_dispi_t * dispi);
static lv_action_res_t ddlist_action(lv_obj_t * ddlist, lv_dispi_t * dispi);
static lv_action_res_t btn_rel_action(lv_obj_t * btn, lv_indev_proc_t * indev_proc);
static lv_action_res_t ddlist_action(lv_obj_t * ddlist, lv_indev_proc_t * indev_proc);
/**********************
* STATIC VARIABLES
@@ -187,10 +187,10 @@ void lv_ex_objects(void)
/**
* Called when a button is released
* @param btn pointer to the released button
* @param dispi pointer to caller display input (e.g. touchpad)
* @param indev_proc pointer to caller display input (e.g. touchpad)
* @return LV_ACTION_RES_OK because the object is not deleted in this function
*/
static lv_action_res_t btn_rel_action(lv_obj_t * btn, lv_dispi_t * dispi)
static lv_action_res_t btn_rel_action(lv_obj_t * btn, lv_indev_proc_t * indev_proc)
{
/*Increase the button width*/
cord_t width = lv_obj_get_width(btn);
@@ -202,10 +202,10 @@ static lv_action_res_t btn_rel_action(lv_obj_t * btn, lv_dispi_t * dispi)
/**
* Called when a new option is chosen in the drop down list
* @param ddlist pointer to the drop down list
* @param dispi pointer to caller display input (e.g. touchpad)
* @param indev_proc pointer to caller display input (e.g. touchpad)
* @return LV_ACTION_RES_OK because the object is not deleted in this function
*/
static lv_action_res_t ddlist_action(lv_obj_t * ddlist, lv_dispi_t * dispi)
static lv_action_res_t ddlist_action(lv_obj_t * ddlist, lv_indev_proc_t * indev_proc)
{
uint16_t opt = lv_ddlist_get_selected(ddlist); /*Get the id of selected option*/