diff --git a/lv_conf_template.h b/lv_conf_template.h index 832a3aabe..7471b8d13 100644 --- a/lv_conf_template.h +++ b/lv_conf_template.h @@ -460,8 +460,12 @@ typedef void * lv_user_data_t; /* A simple, impressive and very complete theme */ #define LV_USE_THEME_DEFAULT 1 #if LV_USE_THEME_DEFAULT + /* 1: Light mode; 0: Dark mode*/ -# define LV_THEME_DEFAULT_FLAG_LIGHT 1 +# define LV_THEME_DEFAULT_PALETTE_LIGHT 1 + +/* 1: Enable grow on press*/ +# define LV_THEME_DEFAULT_GROW 0 /*Default transition time in [ms]*/ # define LV_THEME_DEFAULT_TRANSITON_TIME 80 diff --git a/src/lv_core/lv_obj_pos.c b/src/lv_core/lv_obj_pos.c index a9136efa0..207bcbbbc 100644 --- a/src/lv_core/lv_obj_pos.c +++ b/src/lv_core/lv_obj_pos.c @@ -221,12 +221,12 @@ void lv_obj_align(lv_obj_t * obj, const lv_obj_t * base, lv_align_t align, lv_co case LV_ALIGN_IN_LEFT_MID: x = 0; - y = lv_obj_get_height(base) / 2 - lv_obj_get_height(obj) / 2 - pleft; + y = lv_obj_get_height(base) / 2 - lv_obj_get_height(obj) / 2; break; case LV_ALIGN_IN_RIGHT_MID: x = lv_obj_get_width_fit(base) - lv_obj_get_width(obj); - y = lv_obj_get_height_fit(base) / 2 - lv_obj_get_height(obj) / 2 - pleft; + y = lv_obj_get_height_fit(base) / 2 - lv_obj_get_height(obj) / 2; break; case LV_ALIGN_OUT_TOP_LEFT: