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

Formatting all header files (*.h) in accordance with project coding style, using the astyle tool and the rules file _astylerc-h.

Browse Source
This commit is contained in:
Alexander
2018-06-18 13:52:14 +03:00
parent 8e9335d49f
commit 5ff4125c56
49 changed files with 271 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lv_core/lv_group.h
View File

@@ -49,7 +49,7 @@ typedef struct _lv_group_t
lv_group_focus_cb_t focus_cb; /*A function to call when a new object is focused (optional)*/
lv_style_t style_tmp; /*Stores the modified style of the focused object */
uint8_t frozen:1; /*1: can't focus to new object*/
}lv_group_t;
} lv_group_t;
/**********************
* GLOBAL PROTOTYPES

2
lv_core/lv_indev.h
View File

@@ -1,6 +1,6 @@
/**
* @file lv_indev_proc.h
*
*
*/
#ifndef LV_INDEV_H

56
lv_core/lv_obj.h
View File

@@ -1,6 +1,6 @@
/**
* @file lv_obj.h
*
*
*/
#ifndef LV_OBJ_H
@@ -48,9 +48,9 @@ extern "C" {
#endif
#define LV_ANIM_IN 0x00 /*Animation to show an object. 'OR' it with lv_anim_builtin_t*/
#define LV_ANIM_OUT 0x80 /*Animation to hide an object. 'OR' it with lv_anim_builtin_t*/
#define LV_ANIM_DIR_MASK 0x80 /*ANIM_IN/ANIM_OUT mask*/
#define LV_ANIM_IN 0x00 /*Animation to show an object. 'OR' it with lv_anim_builtin_t*/
#define LV_ANIM_OUT 0x80 /*Animation to hide an object. 'OR' it with lv_anim_builtin_t*/
#define LV_ANIM_DIR_MASK 0x80 /*ANIM_IN/ANIM_OUT mask*/
#define LV_MAX_ANCESTOR_NUM 8
/**********************
@@ -64,7 +64,7 @@ typedef enum
LV_DESIGN_DRAW_MAIN,
LV_DESIGN_DRAW_POST,
LV_DESIGN_COVER_CHK,
}lv_design_mode_t;
} lv_design_mode_t;
typedef bool (* lv_design_func_t) (struct _lv_obj_t * obj, const lv_area_t * mask_p, lv_design_mode_t mode);
@@ -72,19 +72,19 @@ typedef enum
{
LV_RES_INV = 0, /*Typically indicates that the object is deleted (become invalid) in the action function*/
LV_RES_OK, /*The object is valid (no deleted) after the action*/
}lv_res_t;
} lv_res_t;
typedef enum
{
/*General signals*/
LV_SIGNAL_CLEANUP,
LV_SIGNAL_CLEANUP,
LV_SIGNAL_CHILD_CHG,
LV_SIGNAL_CORD_CHG,
LV_SIGNAL_STYLE_CHG,
LV_SIGNAL_REFR_EXT_SIZE,
LV_SIGNAL_GET_TYPE,
LV_SIGNAL_REFR_EXT_SIZE,
LV_SIGNAL_GET_TYPE,
/*Input device related*/
/*Input device related*/
LV_SIGNAL_PRESSED,
LV_SIGNAL_PRESSING,
LV_SIGNAL_PRESS_LOST,
@@ -94,11 +94,11 @@ typedef enum
LV_SIGNAL_DRAG_BEGIN,
LV_SIGNAL_DRAG_END,
/*Group related*/
/*Group related*/
LV_SIGNAL_FOCUS,
LV_SIGNAL_DEFOCUS,
LV_SIGNAL_CONTROLL,
}lv_signal_t;
} lv_signal_t;
typedef lv_res_t (* lv_signal_func_t) (struct _lv_obj_t * obj, lv_signal_t sign, void * param);
@@ -106,12 +106,12 @@ typedef struct _lv_obj_t
{
struct _lv_obj_t * par; /*Pointer to the parent object*/
lv_ll_t child_ll; /*Linked list to store the children objects*/
lv_area_t coords; /*Coordinates of the object (x1, y1, x2, y2)*/
lv_signal_func_t signal_func; /*Object type specific signal function*/
lv_design_func_t design_func; /*Object type specific design function*/
void * ext_attr; /*Object type specific extended data*/
lv_style_t * style_p; /*Pointer to the object's style*/
@@ -133,12 +133,12 @@ typedef struct _lv_obj_t
uint8_t protect; /*Automatically happening actions can be prevented. 'OR'ed values from lv_obj_prot_t*/
lv_coord_t ext_size; /*EXTtend the size of the object in every direction. E.g. for shadow drawing*/
lv_coord_t ext_size; /*EXTtend the size of the object in every direction. E.g. for shadow drawing*/
#ifdef LV_OBJ_FREE_NUM_TYPE
LV_OBJ_FREE_NUM_TYPE free_num; /*Application specific identifier (set it freely)*/
LV_OBJ_FREE_NUM_TYPE free_num; /*Application specific identifier (set it freely)*/
#endif
}lv_obj_t;
} lv_obj_t;
typedef lv_res_t (*lv_action_t) (struct _lv_obj_t * obj);
@@ -151,13 +151,13 @@ typedef enum
LV_PROTECT_POS = 0x04, /*Prevent automatic positioning (e.g. in lv_cont layout)*/
LV_PROTECT_FOLLOW = 0x08, /*Prevent the object be followed in automatic ordering (e.g. in lv_cont PRETTY layout)*/
LV_PROTECT_PRESS_LOST= 0x10, /*TODO */
}lv_protect_t;
} lv_protect_t;
/*Used by `lv_obj_get_type()`. The object's and its ancestor types are stored here*/
typedef struct {
const char * type[LV_MAX_ANCESTOR_NUM]; /*[0]: the actual type, [1]: ancestor, [2] #1's ancestor ... [x]: "lv_obj" */
}lv_obj_type_t;
} lv_obj_type_t;
typedef enum
{
@@ -182,18 +182,18 @@ typedef enum
LV_ALIGN_OUT_RIGHT_TOP,
LV_ALIGN_OUT_RIGHT_MID,
LV_ALIGN_OUT_RIGHT_BOTTOM,
}lv_align_t;
} lv_align_t;
typedef enum
{
LV_ANIM_NONE = 0,
LV_ANIM_FLOAT_TOP, /*Float from/to the top*/
LV_ANIM_FLOAT_LEFT, /*Float from/to the left*/
LV_ANIM_FLOAT_BOTTOM, /*Float from/to the bottom*/
LV_ANIM_FLOAT_RIGHT, /*Float from/to the right*/
LV_ANIM_GROW_H, /*Grow/shrink horizontally*/
LV_ANIM_GROW_V, /*Grow/shrink vertically*/
}lv_anim_builtin_t;
LV_ANIM_NONE = 0,
LV_ANIM_FLOAT_TOP, /*Float from/to the top*/
LV_ANIM_FLOAT_LEFT, /*Float from/to the left*/
LV_ANIM_FLOAT_BOTTOM, /*Float from/to the bottom*/
LV_ANIM_FLOAT_RIGHT, /*Float from/to the right*/
LV_ANIM_GROW_H, /*Grow/shrink horizontally*/
LV_ANIM_GROW_V, /*Grow/shrink vertically*/
} lv_anim_builtin_t;
/**********************
* GLOBAL PROTOTYPES

2
lv_core/lv_refr.h
View File

@@ -1,6 +1,6 @@
/**
* @file lv_refr.h
*
*
*/
#ifndef LV_REFR_H

22
lv_core/lv_style.h
View File

@@ -37,14 +37,14 @@ typedef enum
LV_BORDER_LEFT = 0x04,
LV_BORDER_RIGHT = 0x08,
LV_BORDER_FULL = 0x0F,
}lv_border_part_t;
} lv_border_part_t;
/*Shadow types*/
typedef enum
{
LV_SHADOW_BOTTOM = 0,
LV_SHADOW_FULL,
}lv_shadow_type_t;
} lv_shadow_type_t;
typedef struct
{
@@ -61,22 +61,22 @@ typedef struct
lv_coord_t width;
lv_border_part_t part;
lv_opa_t opa;
}border;
} border;
struct {
lv_color_t color;
lv_coord_t width;
uint8_t type;
}shadow;
} shadow;
struct {
lv_coord_t ver;
lv_coord_t hor;
lv_coord_t inner;
}padding;
} padding;
uint8_t empty :1; /*Transparent background (border still drawn)*/
}body;
} body;
struct {
@@ -85,20 +85,20 @@ typedef struct
lv_coord_t letter_space;
lv_coord_t line_space;
lv_opa_t opa;
}text;
} text;
struct {
lv_color_t color;
lv_opa_t intense;
lv_opa_t opa;
}image;
} image;
struct {
lv_color_t color;
lv_coord_t width;
lv_opa_t opa;
}line;
}lv_style_t;
} line;
} lv_style_t;
#if USE_LV_ANIMATION
typedef struct {
@@ -112,7 +112,7 @@ typedef struct {
uint16_t repeat_pause; /*Wait before repeat*/
uint8_t playback :1; /*When the animation is ready play it back*/
uint8_t repeat :1; /*Repeat the animation infinitely*/
}lv_style_anim_t;
} lv_style_anim_t;
/* Example initialization
lv_style_anim_t a;

4
lv_core/lv_vdb.h
View File

@@ -1,6 +1,6 @@
/**
* @file lv_vdb.h
*
*
*/
#ifndef LV_VDB_H
@@ -32,7 +32,7 @@ typedef struct
{
lv_area_t area;
lv_color_t *buf;
}lv_vdb_t;
} lv_vdb_t;
/**********************
* GLOBAL PROTOTYPES