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

Merge pull request #936 from manison/patch/fix-typos

Browse Source 
Fix some typos
This commit is contained in:
embeddedt 2019-03-08 10:12:21 -05:00 committed by GitHub
commit 74a9f5b18e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lv_conf_templ.h
View File

@ -185,7 +185,7 @@ typedef void * lv_indev_drv_user_data_t; /*Type of user data in t
* LV_OBJ SETTINGS * LV_OBJ SETTINGS
*==================*/ *==================*/
typedef void * lv_obj_user_data_t; /*Declare the type of the user data of object (can be e.g. `void *`, `int`, `struct`)*/ typedef void * lv_obj_user_data_t; /*Declare the type of the user data of object (can be e.g. `void *`, `int`, `struct`)*/
#define LV_OBJ_REALIGN 0 /*Enable `lv_obj_realaign()` based on `lv_obj_align()` parameters*/ #define LV_OBJ_REALIGN 0 /*Enable `lv_obj_realign()` based on `lv_obj_align()` parameters*/
/*================== /*==================
* LV OBJ X USAGE * LV OBJ X USAGE

8
lv_core/lv_indev.c
View File

@ -285,7 +285,7 @@ lv_indev_feedback_t lv_indev_get_feedback(const lv_indev_t *indev)
*/ */
void lv_indev_wait_release(lv_indev_t * indev) void lv_indev_wait_release(lv_indev_t * indev)
{ {
indev->proc.types.pointer.wait_unil_release = 1; indev->proc.types.pointer.wait_until_release = 1;
} }
/********************** /**********************
@ -644,7 +644,7 @@ static void indev_proc_press(lv_indev_proc_t * proc)
{ {
lv_obj_t * pr_obj = proc->types.pointer.act_obj; lv_obj_t * pr_obj = proc->types.pointer.act_obj;
if(proc->types.pointer.wait_unil_release != 0) return; if(proc->types.pointer.wait_until_release != 0) return;
lv_disp_t * disp = indev_act->driver.disp; lv_disp_t * disp = indev_act->driver.disp;
@ -777,12 +777,12 @@ static void indev_proc_press(lv_indev_proc_t * proc)
*/ */
static void indev_proc_release(lv_indev_proc_t * proc) static void indev_proc_release(lv_indev_proc_t * proc)
{ {
if(proc->types.pointer.wait_unil_release != 0) { if(proc->types.pointer.wait_until_release != 0) {
proc->types.pointer.act_obj = NULL; proc->types.pointer.act_obj = NULL;
proc->types.pointer.last_obj = NULL; proc->types.pointer.last_obj = NULL;
proc->pr_timestamp = 0; proc->pr_timestamp = 0;
proc->longpr_rep_timestamp = 0; proc->longpr_rep_timestamp = 0;
proc->types.pointer.wait_unil_release = 0; proc->types.pointer.wait_until_release = 0;
} }
/*Forget the act obj and send a released signal */ /*Forget the act obj and send a released signal */

2
lv_hal/lv_hal_indev.h
View File

@ -99,7 +99,7 @@ typedef struct _lv_indev_proc_t {
/*Flags*/ /*Flags*/
uint8_t drag_limit_out :1; uint8_t drag_limit_out :1;
uint8_t drag_in_prog :1; uint8_t drag_in_prog :1;
uint8_t wait_unil_release :1; uint8_t wait_until_release :1;
}pointer; }pointer;
struct { /*Keypad data*/ struct { /*Keypad data*/
lv_indev_state_t last_state; lv_indev_state_t last_state;