1
0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-21 06:53:01 +08:00

Merge pull request #983 from amirgon/dev-6.0

comment out unimplemented function
This commit is contained in:
Gabor Kiss-Vamosi 2019-03-26 15:37:48 +01:00 committed by GitHub
commit cf05e2c336
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 6 deletions

View File

@ -73,10 +73,11 @@ typedef struct _lv_group_t
uint8_t wrap :1; /*1: Focus next/prev can wrap at end of list. 0: Focus next/prev stops at end of list.*/ uint8_t wrap :1; /*1: Focus next/prev can wrap at end of list. 0: Focus next/prev stops at end of list.*/
} lv_group_t; } lv_group_t;
typedef enum _lv_group_refocus_policy_t { enum {
LV_GROUP_REFOCUS_POLICY_NEXT = 0, LV_GROUP_REFOCUS_POLICY_NEXT = 0,
LV_GROUP_REFOCUS_POLICY_PREV = 1 LV_GROUP_REFOCUS_POLICY_PREV = 1
} lv_group_refocus_policy_t; };
typedef uint8_t lv_group_refocus_policy_t;
/********************** /**********************
* GLOBAL PROTOTYPES * GLOBAL PROTOTYPES

View File

@ -72,7 +72,7 @@ enum
typedef uint8_t lv_res_t; typedef uint8_t lv_res_t;
typedef enum { enum {
LV_EVENT_PRESSED, /*The object has been pressed*/ LV_EVENT_PRESSED, /*The object has been pressed*/
LV_EVENT_PRESSING, /*The object is being pressed (called continuously while pressing)*/ LV_EVENT_PRESSING, /*The object is being pressed (called continuously while pressing)*/
LV_EVENT_PRESS_LOST, /*Still pressing but slid from the objects*/ LV_EVENT_PRESS_LOST, /*Still pressing but slid from the objects*/
@ -94,7 +94,8 @@ typedef enum {
LV_EVENT_REFRESH, LV_EVENT_REFRESH,
LV_EVENT_APPLY, /*"Ok", "Apply" or similar specific button has clicked*/ LV_EVENT_APPLY, /*"Ok", "Apply" or similar specific button has clicked*/
LV_EVENT_CANCEL, /*"Close", "Cancel" or similar specific button has clicked*/ LV_EVENT_CANCEL, /*"Close", "Cancel" or similar specific button has clicked*/
}lv_event_t; };
typedef uint8_t lv_event_t;
typedef void (*lv_event_cb_t)(struct _lv_obj_t * obj, lv_event_t event); typedef void (*lv_event_cb_t)(struct _lv_obj_t * obj, lv_event_t event);

View File

@ -171,6 +171,18 @@ lv_color_t lv_canvas_get_px(lv_obj_t * canvas, lv_coord_t x, lv_coord_t y)
return lv_img_buf_get_px(&ext->dsc, x, y); return lv_img_buf_get_px(&ext->dsc, x, y);
} }
/**
* Get the image of the canvas as a pointer to an `lv_img_dsc_t` variable.
* @param canvas pointer to a canvas object
* @return pointer to the image descriptor.
*/
lv_img_dsc_t * lv_canvas_get_img(lv_obj_t * canvas)
{
lv_canvas_ext_t * ext = lv_obj_get_ext_attr(canvas);
return &ext->img;
}
/** /**
* Get style of a canvas. * Get style of a canvas.
* @param canvas pointer to canvas object * @param canvas pointer to canvas object

View File

@ -48,12 +48,13 @@ enum
typedef uint8_t lv_layout_t; typedef uint8_t lv_layout_t;
typedef enum { enum {
LV_FIT_NONE, /*Do not change the size automatically*/ LV_FIT_NONE, /*Do not change the size automatically*/
LV_FIT_TIGHT, /*Involve the children*/ LV_FIT_TIGHT, /*Involve the children*/
LV_FIT_FLOOD, /*Align the size to the parent's edge*/ LV_FIT_FLOOD, /*Align the size to the parent's edge*/
LV_FIT_FILL, /*Align the size to the parent's edge first but if there is an object out of it then involve it*/ LV_FIT_FILL, /*Align the size to the parent's edge first but if there is an object out of it then involve it*/
}lv_fit_t; };
typedef uint8_t lv_fit_t;
typedef struct typedef struct
{ {