mirror of
https://github.com/lvgl/lvgl.git
synced 2025-01-28 07:03:00 +08:00
Merge branch 'dev-6.0' of https://github.com/littlevgl/lvgl into dev-6.0
This commit is contained in:
commit
795f5772b6
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,3 +1,4 @@
|
|||||||
**/*.o
|
**/*.o
|
||||||
**/*.swp
|
**/*.swp
|
||||||
**/*.swo
|
**/*.swo
|
||||||
|
tags
|
||||||
|
@ -12,6 +12,10 @@
|
|||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
#include "../lv_misc/lv_gc.h"
|
#include "../lv_misc/lv_gc.h"
|
||||||
|
|
||||||
|
#if defined(LV_GC_INCLUDE)
|
||||||
|
# include LV_GC_INCLUDE
|
||||||
|
#endif /* LV_ENABLE_GC */
|
||||||
|
|
||||||
/*********************
|
/*********************
|
||||||
* DEFINES
|
* DEFINES
|
||||||
*********************/
|
*********************/
|
||||||
|
@ -15,6 +15,10 @@
|
|||||||
#include "../lv_misc/lv_mem.h"
|
#include "../lv_misc/lv_mem.h"
|
||||||
#include "../lv_misc/lv_gc.h"
|
#include "../lv_misc/lv_gc.h"
|
||||||
|
|
||||||
|
#if defined(LV_GC_INCLUDE)
|
||||||
|
# include LV_GC_INCLUDE
|
||||||
|
#endif /* LV_ENABLE_GC */
|
||||||
|
|
||||||
/*********************
|
/*********************
|
||||||
* DEFINES
|
* DEFINES
|
||||||
*********************/
|
*********************/
|
||||||
|
@ -60,18 +60,6 @@ void lv_refr_now(void);
|
|||||||
*/
|
*/
|
||||||
void lv_inv_area(lv_disp_t * disp, const lv_area_t * area_p);
|
void lv_inv_area(lv_disp_t * disp, const lv_area_t * area_p);
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the number of areas in the buffer
|
|
||||||
* @return number of invalid areas
|
|
||||||
*/
|
|
||||||
uint16_t lv_refr_get_buf_size(void);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Pop (delete) the last 'num' invalidated areas from the buffer
|
|
||||||
* @param num number of areas to delete
|
|
||||||
*/
|
|
||||||
void lv_refr_pop_from_buf(uint16_t num);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the display which is being refreshed
|
* Get the display which is being refreshed
|
||||||
* @return the display being refreshed
|
* @return the display being refreshed
|
||||||
|
@ -630,7 +630,7 @@ static lv_res_t lv_img_built_in_decoder_line_alpha(lv_coord_t x, lv_coord_t y, l
|
|||||||
# if LV_COMPILER_VLA_SUPPORTED
|
# if LV_COMPILER_VLA_SUPPORTED
|
||||||
uint8_t fs_buf[w];
|
uint8_t fs_buf[w];
|
||||||
# else
|
# else
|
||||||
uint8_t fs_buf[LV_HOR_RES];
|
uint8_t fs_buf[LV_HOR_RES_MAX];
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
const uint8_t * data_tmp = NULL;
|
const uint8_t * data_tmp = NULL;
|
||||||
@ -717,7 +717,7 @@ static lv_res_t lv_img_built_in_decoder_line_indexed(lv_coord_t x, lv_coord_t y,
|
|||||||
# if LV_COMPILER_VLA_SUPPORTED
|
# if LV_COMPILER_VLA_SUPPORTED
|
||||||
uint8_t fs_buf[w];
|
uint8_t fs_buf[w];
|
||||||
# else
|
# else
|
||||||
uint8_t fs_buf[LV_HOR_RES];
|
uint8_t fs_buf[LV_HOR_RES_MAX];
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
const uint8_t * data_tmp = NULL;
|
const uint8_t * data_tmp = NULL;
|
||||||
|
@ -1088,7 +1088,7 @@ static void lv_draw_shadow_full(const lv_area_t * coords, const lv_area_t * mask
|
|||||||
#if LV_COMPILER_VLA_SUPPORTED
|
#if LV_COMPILER_VLA_SUPPORTED
|
||||||
lv_coord_t curve_x[radius + swidth + 1]; /*Stores the 'x' coordinates of a quarter circle.*/
|
lv_coord_t curve_x[radius + swidth + 1]; /*Stores the 'x' coordinates of a quarter circle.*/
|
||||||
#else
|
#else
|
||||||
# if LV_HOR_RES > LV_VER_RES
|
# if LV_HOR_RES_MAX > LV_VER_RES_MAX
|
||||||
lv_coord_t curve_x[LV_HOR_RES_MAX];
|
lv_coord_t curve_x[LV_HOR_RES_MAX];
|
||||||
# else
|
# else
|
||||||
lv_coord_t curve_x[LV_VER_RES_MAX];
|
lv_coord_t curve_x[LV_VER_RES_MAX];
|
||||||
@ -1109,7 +1109,7 @@ static void lv_draw_shadow_full(const lv_area_t * coords, const lv_area_t * mask
|
|||||||
#if LV_COMPILER_VLA_SUPPORTED
|
#if LV_COMPILER_VLA_SUPPORTED
|
||||||
uint32_t line_1d_blur[filter_width];
|
uint32_t line_1d_blur[filter_width];
|
||||||
#else
|
#else
|
||||||
# if LV_HOR_RES > LV_VER_RES
|
# if LV_HOR_RES_MAX > LV_VER_RES_MAX
|
||||||
uint32_t line_1d_blur[LV_HOR_RES_MAX];
|
uint32_t line_1d_blur[LV_HOR_RES_MAX];
|
||||||
# else
|
# else
|
||||||
uint32_t line_1d_blur[LV_VER_RES_MAX];
|
uint32_t line_1d_blur[LV_VER_RES_MAX];
|
||||||
@ -1125,7 +1125,7 @@ static void lv_draw_shadow_full(const lv_area_t * coords, const lv_area_t * mask
|
|||||||
#if LV_COMPILER_VLA_SUPPORTED
|
#if LV_COMPILER_VLA_SUPPORTED
|
||||||
lv_opa_t line_2d_blur[radius + swidth + 1];
|
lv_opa_t line_2d_blur[radius + swidth + 1];
|
||||||
#else
|
#else
|
||||||
# if LV_HOR_RES > LV_VER_RES
|
# if LV_HOR_RES_MAX > LV_VER_RES_MAX
|
||||||
lv_opa_t line_2d_blur[LV_HOR_RES_MAX];
|
lv_opa_t line_2d_blur[LV_HOR_RES_MAX];
|
||||||
# else
|
# else
|
||||||
lv_opa_t line_2d_blur[LV_VER_RES_MAX];
|
lv_opa_t line_2d_blur[LV_VER_RES_MAX];
|
||||||
@ -1246,7 +1246,7 @@ static void lv_draw_shadow_bottom(const lv_area_t * coords, const lv_area_t * ma
|
|||||||
#if LV_COMPILER_VLA_SUPPORTED
|
#if LV_COMPILER_VLA_SUPPORTED
|
||||||
lv_coord_t curve_x[radius + 1]; /*Stores the 'x' coordinates of a quarter circle.*/
|
lv_coord_t curve_x[radius + 1]; /*Stores the 'x' coordinates of a quarter circle.*/
|
||||||
#else
|
#else
|
||||||
# if LV_HOR_RES > LV_VER_RES
|
# if LV_HOR_RES_MAX > LV_VER_RES_MAX
|
||||||
lv_coord_t curve_x[LV_HOR_RES_MAX];
|
lv_coord_t curve_x[LV_HOR_RES_MAX];
|
||||||
# else
|
# else
|
||||||
lv_coord_t curve_x[LV_VER_RES_MAX];
|
lv_coord_t curve_x[LV_VER_RES_MAX];
|
||||||
@ -1265,7 +1265,7 @@ static void lv_draw_shadow_bottom(const lv_area_t * coords, const lv_area_t * ma
|
|||||||
#if LV_COMPILER_VLA_SUPPORTED
|
#if LV_COMPILER_VLA_SUPPORTED
|
||||||
lv_opa_t line_1d_blur[swidth];
|
lv_opa_t line_1d_blur[swidth];
|
||||||
#else
|
#else
|
||||||
# if LV_HOR_RES > LV_VER_RES
|
# if LV_HOR_RES_MAX > LV_VER_RES_MAX
|
||||||
lv_opa_t line_1d_blur[LV_HOR_RES_MAX];
|
lv_opa_t line_1d_blur[LV_HOR_RES_MAX];
|
||||||
# else
|
# else
|
||||||
lv_opa_t line_1d_blur[LV_VER_RES_MAX];
|
lv_opa_t line_1d_blur[LV_VER_RES_MAX];
|
||||||
|
@ -94,8 +94,8 @@ lv_indev_t * lv_indev_drv_register(lv_indev_drv_t * driver)
|
|||||||
*/
|
*/
|
||||||
lv_indev_t * lv_indev_next(lv_indev_t * indev)
|
lv_indev_t * lv_indev_next(lv_indev_t * indev)
|
||||||
{
|
{
|
||||||
if(indev == NULL) return lv_ll_get_head(LV_GC_ROOT(&_lv_indev_ll));
|
if(indev == NULL) return lv_ll_get_head(&LV_GC_ROOT(_lv_indev_ll));
|
||||||
else return lv_ll_get_next(LV_GC_ROOT(&_lv_indev_ll), indev);
|
else return lv_ll_get_next(&LV_GC_ROOT(_lv_indev_ll), indev);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -590,7 +590,7 @@ const char * lv_btnm_get_btn_text(const lv_obj_t * btnm, uint16_t btn_id)
|
|||||||
* @param btn_index the index a button not counting new line characters. (The return value of lv_btnm_get_pressed/released)
|
* @param btn_index the index a button not counting new line characters. (The return value of lv_btnm_get_pressed/released)
|
||||||
* @return true: long press repeat is disabled; false: long press repeat enabled
|
* @return true: long press repeat is disabled; false: long press repeat enabled
|
||||||
*/
|
*/
|
||||||
bool lv_btnm_get_btn_no_repeate(lv_obj_t * btnm, uint16_t btn_id)
|
bool lv_btnm_get_btn_no_repeat(lv_obj_t * btnm, uint16_t btn_id)
|
||||||
{
|
{
|
||||||
lv_btnm_ext_t * ext = lv_obj_get_ext_attr(btnm);
|
lv_btnm_ext_t * ext = lv_obj_get_ext_attr(btnm);
|
||||||
return button_is_repeat_disabled(ext->ctrl_bits[btn_id]);
|
return button_is_repeat_disabled(ext->ctrl_bits[btn_id]);
|
||||||
|
@ -264,7 +264,7 @@ const char * lv_btnm_get_btn_text(const lv_obj_t * btnm, uint16_t btn_id);
|
|||||||
* @param btn_index the index a button not counting new line characters. (The return value of lv_btnm_get_pressed/released)
|
* @param btn_index the index a button not counting new line characters. (The return value of lv_btnm_get_pressed/released)
|
||||||
* @return true: long press repeat is disabled; false: long press repeat enabled
|
* @return true: long press repeat is disabled; false: long press repeat enabled
|
||||||
*/
|
*/
|
||||||
bool lv_btnm_get_btn_no_repeate(lv_obj_t * btnm, uint16_t btn_id);
|
bool lv_btnm_get_btn_no_repeat(lv_obj_t * btnm, uint16_t btn_id);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check whether a button for a button is hidden or not.
|
* Check whether a button for a button is hidden or not.
|
||||||
|
@ -122,13 +122,6 @@ void lv_spinbox_set_step(lv_obj_t * spinbox, uint32_t step);
|
|||||||
*/
|
*/
|
||||||
void lv_spinbox_set_range(lv_obj_t * spinbox, int32_t range_min, int32_t range_max);
|
void lv_spinbox_set_range(lv_obj_t * spinbox, int32_t range_min, int32_t range_max);
|
||||||
|
|
||||||
/**
|
|
||||||
* Set spinbox callback on calue change
|
|
||||||
* @param spinbox pointer to spinbox
|
|
||||||
* @param cb Callback function called on value change event
|
|
||||||
*/
|
|
||||||
void lv_spinbox_set_value_changed_cb(lv_obj_t * spinbox, lv_spinbox_value_changed_cb_t cb);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set spinbox left padding in digits count (added between sign and first digit)
|
* Set spinbox left padding in digits count (added between sign and first digit)
|
||||||
* @param spinbox pointer to spinbox
|
* @param spinbox pointer to spinbox
|
||||||
|
Loading…
x
Reference in New Issue
Block a user