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

bugfix with LV_APP_EFFECT_OPA_ANIM 0 bugfif + letter draw bugfix

Browse Source
This commit is contained in:
Kiss-Vamosi Gabor
2016-12-26 14:44:27 +01:00
parent 0f5e5f6ed6
commit 3019787dcf
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lv_app/lv_app.c
View File

@@ -840,7 +840,7 @@ static lv_action_res_t lv_app_win_minim_anim_create(lv_app_inst_t * app)
a.end = cords.y1; a.end = cords.y1;
a.start = 0; a.start = 0;
a.fp = (anim_fp_t) lv_obj_set_y; a.fp = (anim_fp_t) lv_obj_set_y;
#if LV_APP_EFFECT_OPA == 0 #if LV_APP_EFFECT_OPA_ANIM == 0
a.end_cb = (void (*)(void *))lv_app_win_close_anim_cb; a.end_cb = (void (*)(void *))lv_app_win_close_anim_cb;
#endif #endif
anim_create(&a); anim_create(&a);

10
lv_draw/lv_draw_vbasic.c
View File

@@ -128,10 +128,10 @@ void lv_vletter(const point_t * pos_p, const area_t * mask_p,
uint8_t col_bit; uint8_t col_bit;
uint8_t col_byte_cnt; uint8_t col_byte_cnt;
cord_t col_start = pos_p->x >= mask_p->x1 ? 0 : mask_p->x1 - pos_p->x; cord_t col_start = pos_p->x > mask_p->x1 ? 0 : mask_p->x1 - pos_p->x;
cord_t col_end = pos_p->x + letter_w <= mask_p->x2 ? letter_w : mask_p->x2 - pos_p->x + 1; cord_t col_end = pos_p->x + letter_w < mask_p->x2 ? letter_w : mask_p->x2 - pos_p->x + 1;
cord_t row_start = pos_p->y >= mask_p->y1 ? 0 : mask_p->y1 - pos_p->y; cord_t row_start = pos_p->y > mask_p->y1 ? 0 : mask_p->y1 - pos_p->y;
cord_t row_end = pos_p->y + letter_h <= mask_p->y2 ? letter_h : mask_p->y2 - pos_p->y + 1; cord_t row_end = pos_p->y + letter_h < mask_p->y2 ? letter_h : mask_p->y2 - pos_p->y + 1;
/*Set a pointer on VDB to the first pixel of the letter*/ /*Set a pointer on VDB to the first pixel of the letter*/
vdb_buf_tmp += ((pos_p->y - vdb_p->vdb_area.y1) * vdb_width) vdb_buf_tmp += ((pos_p->y - vdb_p->vdb_area.y1) * vdb_width)
@@ -145,7 +145,7 @@ void lv_vletter(const point_t * pos_p, const area_t * mask_p,
for(row = row_start; row < row_end; row ++) { for(row = row_start; row < row_end; row ++) {
col_byte_cnt = 0; col_byte_cnt = 0;
col_bit = 7 - ((col_start / 2) % 8); col_bit = 7 - (col_start % 8);
for(col = col_start; col < col_end; col ++) { for(col = col_start; col < col_end; col ++) {
if((*map_p & (1 << col_bit)) != 0) { if((*map_p & (1 << col_bit)) != 0) {

2
lvgl.h
View File

@@ -33,7 +33,7 @@
*********************/ *********************/
#define LVGL_VERSION_MAJOR 2 #define LVGL_VERSION_MAJOR 2
#define LVGL_VERSION_MINOR 0 #define LVGL_VERSION_MINOR 0
#define LVGL_VERSION_BUGFIX 0 #define LVGL_VERSION_BUGFIX 1
/********************** /**********************
* TYPEDEFS * TYPEDEFS