Mirrors_UI_SDK/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2026-05-30 23:51:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2020-04-24 22:05:00 +02:00
parent 660d0d6000 13dd42fd0b
commit 15e064f4af
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lv_hal/lv_hal_disp.h
+4 -4
View File
@@ -52,10 +52,10 @@ typedef struct {
void * buf_act; void * buf_act;
uint32_t size; /*In pixel count*/ uint32_t size; /*In pixel count*/
lv_area_t area; lv_area_t area;
volatile uint32_t flushing :1; volatile int flushing; /*1: flushing is in progress. (It can't be a bitfield because when it's cleared from IRQ Read-Modify-Write issue might occur)*/
volatile uint32_t flushing_last :1; volatile int flushing_last; /*1: It was the last chunk to flush. (It can't be a bitfield because when it's cleared from IRQ Read-Modify-Write issue might occur)*/
volatile uint32_t last_area :1; volatile uint32_t last_area :1; /*1: the last area is being rendered*/
volatile uint32_t last_part :1; volatile uint32_t last_part :1; /*1: the last part of the current area is being rendered*/
} lv_disp_buf_t; } lv_disp_buf_t;
/** /**
src/lv_themes/lv_theme_material.c
+1
View File
@@ -648,6 +648,7 @@ static void page_init(void)
lv_style_set_size(&sb, LV_STATE_DEFAULT, LV_DPX(7)); lv_style_set_size(&sb, LV_STATE_DEFAULT, LV_DPX(7));
lv_style_set_pad_right(&sb, LV_STATE_DEFAULT, LV_DPX(7)); lv_style_set_pad_right(&sb, LV_STATE_DEFAULT, LV_DPX(7));
lv_style_set_pad_bottom(&sb, LV_STATE_DEFAULT, LV_DPX(7)); lv_style_set_pad_bottom(&sb, LV_STATE_DEFAULT, LV_DPX(7));
#if LV_USE_ANIMATION #if LV_USE_ANIMATION
style_init_reset(&edge_flash); style_init_reset(&edge_flash);
lv_style_set_bg_opa(&edge_flash, LV_STATE_DEFAULT, LV_OPA_COVER); lv_style_set_bg_opa(&edge_flash, LV_STATE_DEFAULT, LV_OPA_COVER);