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

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi 2020-11-17 11:29:58 +01:00
commit 70438d158d
5 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library.json
View File

@ -1,6 +1,6 @@
{ {
"name": "lvgl", "name": "lvgl",
"version": "7.7.1", "version": "7.7.2",
"keywords": "graphics, gui, embedded, tft, lvgl", "keywords": "graphics, gui, embedded, tft, lvgl",
"description": "Graphics library to create embedded GUI with easy-to-use graphical elements, beautiful visual effects and low memory footprint. It offers anti-aliasing, opacity, and animations using only one frame buffer.", "description": "Graphics library to create embedded GUI with easy-to-use graphical elements, beautiful visual effects and low memory footprint. It offers anti-aliasing, opacity, and animations using only one frame buffer.",
"repository": { "repository": {

2
src/lv_draw/lv_draw_triangle.c
View File

@ -115,7 +115,7 @@ void lv_draw_polygon(const lv_point_t points[], uint16_t point_cnt, const lv_are
lv_coord_t dyr = points[i_next_right].y - points[y_min_i].y; lv_coord_t dyr = points[i_next_right].y - points[y_min_i].y;
bool inv = false; bool inv = false;
if(dyl*dxr < dyr*dxl) inv = true; if(dyl * dxr < dyr * dxl) inv = true;
do { do {
if(!inv) { if(!inv) {

24
src/lv_font/lv_font_fmt_txt.c
View File

@ -43,24 +43,24 @@ static int32_t kern_pair_8_compare(const void * ref, const void * element);
static int32_t kern_pair_16_compare(const void * ref, const void * element); static int32_t kern_pair_16_compare(const void * ref, const void * element);
#if LV_USE_FONT_COMPRESSED #if LV_USE_FONT_COMPRESSED
static void decompress(const uint8_t * in, uint8_t * out, lv_coord_t w, lv_coord_t h, uint8_t bpp, bool prefilter); static void decompress(const uint8_t * in, uint8_t * out, lv_coord_t w, lv_coord_t h, uint8_t bpp, bool prefilter);
static inline void decompress_line(uint8_t * out, lv_coord_t w); static inline void decompress_line(uint8_t * out, lv_coord_t w);
static inline uint8_t get_bits(const uint8_t * in, uint32_t bit_pos, uint8_t len); static inline uint8_t get_bits(const uint8_t * in, uint32_t bit_pos, uint8_t len);
static inline void bits_write(uint8_t * out, uint32_t bit_pos, uint8_t val, uint8_t len); static inline void bits_write(uint8_t * out, uint32_t bit_pos, uint8_t val, uint8_t len);
static inline void rle_init(const uint8_t * in, uint8_t bpp); static inline void rle_init(const uint8_t * in, uint8_t bpp);
static inline uint8_t rle_next(void); static inline uint8_t rle_next(void);
#endif /* LV_USE_FONT_COMPRESSED */ #endif /* LV_USE_FONT_COMPRESSED */
/********************** /**********************
* STATIC VARIABLES * STATIC VARIABLES
**********************/ **********************/
#if LV_USE_FONT_COMPRESSED #if LV_USE_FONT_COMPRESSED
static uint32_t rle_rdp; static uint32_t rle_rdp;
static const uint8_t * rle_in; static const uint8_t * rle_in;
static uint8_t rle_bpp; static uint8_t rle_bpp;
static uint8_t rle_prev_v; static uint8_t rle_prev_v;
static uint8_t rle_cnt; static uint8_t rle_cnt;
static rle_state_t rle_state; static rle_state_t rle_state;
#endif /* LV_USE_FONT_COMPRESSED */ #endif /* LV_USE_FONT_COMPRESSED */
/********************** /**********************

3
src/lv_widgets/lv_arc.c
View File

@ -785,7 +785,8 @@ static lv_res_t lv_arc_signal(lv_obj_t * arc, lv_signal_t sign, void * param)
if(LV_MATH_ABS(delta_angle) > 180) { if(LV_MATH_ABS(delta_angle) > 180) {
if(ext->min_close) angle = 0; if(ext->min_close) angle = 0;
else angle = deg_range; else angle = deg_range;
} else { }
else {
if(angle < deg_range / 2) ext->min_close = 1; if(angle < deg_range / 2) ext->min_close = 1;
else ext->min_close = 0; else ext->min_close = 0;
} }

40
src/lv_widgets/lv_imgbtn.c
View File

@ -543,26 +543,26 @@ static lv_btn_state_t suggest_state(lv_obj_t * imgbtn, lv_btn_state_t state)
lv_imgbtn_ext_t * ext = lv_obj_get_ext_attr(imgbtn); lv_imgbtn_ext_t * ext = lv_obj_get_ext_attr(imgbtn);
if(ext->img_src_mid[state] == NULL) { if(ext->img_src_mid[state] == NULL) {
switch(state) { switch(state) {
case LV_BTN_STATE_PRESSED: case LV_BTN_STATE_PRESSED:
if(ext->img_src_mid[LV_BTN_STATE_RELEASED]) return LV_BTN_STATE_RELEASED; if(ext->img_src_mid[LV_BTN_STATE_RELEASED]) return LV_BTN_STATE_RELEASED;
break; break;
case LV_BTN_STATE_CHECKED_RELEASED: case LV_BTN_STATE_CHECKED_RELEASED:
if(ext->img_src_mid[LV_BTN_STATE_RELEASED]) return LV_BTN_STATE_RELEASED; if(ext->img_src_mid[LV_BTN_STATE_RELEASED]) return LV_BTN_STATE_RELEASED;
break; break;
case LV_BTN_STATE_CHECKED_PRESSED: case LV_BTN_STATE_CHECKED_PRESSED:
if(ext->img_src_mid[LV_BTN_STATE_CHECKED_RELEASED]) return LV_BTN_STATE_CHECKED_RELEASED; if(ext->img_src_mid[LV_BTN_STATE_CHECKED_RELEASED]) return LV_BTN_STATE_CHECKED_RELEASED;
if(ext->img_src_mid[LV_BTN_STATE_PRESSED]) return LV_BTN_STATE_PRESSED; if(ext->img_src_mid[LV_BTN_STATE_PRESSED]) return LV_BTN_STATE_PRESSED;
if(ext->img_src_mid[LV_BTN_STATE_RELEASED]) return LV_BTN_STATE_RELEASED; if(ext->img_src_mid[LV_BTN_STATE_RELEASED]) return LV_BTN_STATE_RELEASED;
break; break;
case LV_BTN_STATE_DISABLED: case LV_BTN_STATE_DISABLED:
if(ext->img_src_mid[LV_BTN_STATE_RELEASED]) return LV_BTN_STATE_RELEASED; if(ext->img_src_mid[LV_BTN_STATE_RELEASED]) return LV_BTN_STATE_RELEASED;
break; break;
case LV_BTN_STATE_CHECKED_DISABLED: case LV_BTN_STATE_CHECKED_DISABLED:
if(ext->img_src_mid[LV_BTN_STATE_CHECKED_RELEASED]) return LV_BTN_STATE_CHECKED_RELEASED; if(ext->img_src_mid[LV_BTN_STATE_CHECKED_RELEASED]) return LV_BTN_STATE_CHECKED_RELEASED;
if(ext->img_src_mid[LV_BTN_STATE_RELEASED]) return LV_BTN_STATE_RELEASED; if(ext->img_src_mid[LV_BTN_STATE_RELEASED]) return LV_BTN_STATE_RELEASED;
break; break;
default: default:
break; break;
} }
} }