diff --git a/lv_core/lv_obj.c b/lv_core/lv_obj.c index d8cba60c0..abeed35f9 100644 --- a/lv_core/lv_obj.c +++ b/lv_core/lv_obj.c @@ -778,6 +778,10 @@ void lv_obj_report_style_mod(lv_style_t * style) { lv_obj_t * i; LL_READ(scr_ll, i) { + if(i->style_p == style || style == NULL) { + lv_obj_refresh_style(i); + } + report_style_mod_core(style, i); } } diff --git a/lv_draw/lv_draw_vbasic.c b/lv_draw/lv_draw_vbasic.c index a756ddb2a..e23f15eaa 100644 --- a/lv_draw/lv_draw_vbasic.c +++ b/lv_draw/lv_draw_vbasic.c @@ -483,7 +483,7 @@ void lv_vmap(const lv_area_t * cords_p, const lv_area_t * mask_p, /*Calculate with the pixel level alpha*/ if(alpha_byte) { -#if LV_COLOR_DEPTH == 8 +#if LV_COLOR_DEPTH == 8 || LV_COLOR_DEPTH == 1 px_color.full = px_color_p[0]; #elif LV_COLOR_DEPTH == 16 /*Because of Alpha byte 16 bit color can start on odd address which can cause crash*/ diff --git a/lv_objx/lv_list.c b/lv_objx/lv_list.c index 67c2dd427..c0c994b65 100644 --- a/lv_objx/lv_list.c +++ b/lv_objx/lv_list.c @@ -408,7 +408,7 @@ lv_obj_t * lv_list_get_prev_btn(const lv_obj_t * list, lv_obj_t * prev_btn) if(btn == NULL) return NULL; while(btn->signal_func != lv_list_btn_signal) { - btn = lv_obj_get_child(scrl, prev_btn); + btn = lv_obj_get_child(scrl, btn); if(btn == NULL) break; } @@ -434,7 +434,7 @@ lv_obj_t * lv_list_get_next_btn(const lv_obj_t * list, lv_obj_t * prev_btn) if(btn == NULL) return NULL; while(btn->signal_func != lv_list_btn_signal) { - btn = lv_obj_get_child_back(scrl, prev_btn); + btn = lv_obj_get_child_back(scrl, btn); if(btn == NULL) break; } diff --git a/lv_objx/lv_mbox.c b/lv_objx/lv_mbox.c index 66fbfa3d6..388bfb6e7 100644 --- a/lv_objx/lv_mbox.c +++ b/lv_objx/lv_mbox.c @@ -276,6 +276,8 @@ void lv_mbox_set_style(lv_obj_t * mbox, lv_mbox_style_t type, lv_style_t * style break; } + mbox_realign(mbox); + } diff --git a/lv_objx/lv_ta.h b/lv_objx/lv_ta.h index 281a84f13..b97c67c49 100644 --- a/lv_objx/lv_ta.h +++ b/lv_objx/lv_ta.h @@ -68,7 +68,7 @@ typedef struct lv_style_t *style; /*Style of the cursor (NULL to use label's style)*/ lv_coord_t valid_x; /*Used when stepping up/down in text area when stepping to a shorter line. (Handled by the library)*/ uint16_t pos; /*The current cursor position (0: before 1. letter; 1: before 2. letter etc.)*/ - lv_cursor_type_t type:2; /*Shape of the cursor*/ + lv_cursor_type_t type:3; /*Shape of the cursor*/ uint8_t state :1; /*Indicates that the cursor is visible now or not (Handled by the library)*/ } cursor; } lv_ta_ext_t; diff --git a/lv_themes/lv_theme_alien.c b/lv_themes/lv_theme_alien.c index 13fe40949..386efb61e 100644 --- a/lv_themes/lv_theme_alien.c +++ b/lv_themes/lv_theme_alien.c @@ -136,6 +136,13 @@ static void basic_init(void) } +static void cont_init(void) +{ +#if USE_LV_CONT != 0 + theme.cont = &panel; +#endif +} + static void btn_init(void) { #if USE_LV_BTN != 0 @@ -785,6 +792,7 @@ lv_theme_t * lv_theme_alien_init(uint16_t hue, lv_font_t * font) } basic_init(); + cont_init(); btn_init(); label_init(); bar_init(); diff --git a/lvgl.h b/lvgl.h index 3f3084c81..6e74d53fa 100644 --- a/lvgl.h +++ b/lvgl.h @@ -61,9 +61,9 @@ extern "C" { *********************/ /*Current version of LittlevGL*/ #define LVGL_VERSION_MAJOR 5 -#define LVGL_VERSION_MINOR 3 +#define LVGL_VERSION_MINOR 2 #define LVGL_VERSION_PATCH 0 -#define LVGL_VERSION_INFO "" +#define LVGL_VERSION_INFO "rc" /********************** * TYPEDEFS