diff --git a/examples/widgets/btn/lv_example_btn_1.c b/examples/widgets/btn/lv_example_btn_1.c index 6b68c47ac..dc20ea015 100644 --- a/examples/widgets/btn/lv_example_btn_1.c +++ b/examples/widgets/btn/lv_example_btn_1.c @@ -26,7 +26,7 @@ void lv_example_btn_1(void) lv_obj_t * btn2 = lv_btn_create(lv_scr_act()); lv_obj_add_event_cb(btn2, event_handler, NULL); - lv_obj_center(btn2); + lv_obj_align(btn2, LV_ALIGN_CENTER, 0, 40); lv_obj_add_flag(btn2, LV_OBJ_FLAG_CHECKABLE); lv_obj_set_height(btn2, LV_SIZE_CONTENT); diff --git a/src/core/lv_obj.c b/src/core/lv_obj.c index 554d2adfa..fa625567e 100644 --- a/src/core/lv_obj.c +++ b/src/core/lv_obj.c @@ -917,7 +917,9 @@ static void lv_obj_event_cb(lv_obj_t * obj, lv_event_t e) lv_obj_refr_pos(child); } - if(lv_obj_get_style_layout(obj, LV_PART_MAIN)) { + lv_coord_t align = lv_obj_get_style_align(obj, LV_PART_MAIN); + uint16_t layout = lv_obj_get_style_layout(obj, LV_PART_MAIN); + if(layout || align) { lv_obj_mark_layout_as_dirty(obj); } } diff --git a/src/core/lv_refr.c b/src/core/lv_refr.c index 3c6cc4a2a..e64cb5cc9 100644 --- a/src/core/lv_refr.c +++ b/src/core/lv_refr.c @@ -239,7 +239,7 @@ void _lv_disp_refr_timer(lv_timer_t * tmr) #if LV_USE_PERF_MONITOR && LV_USE_LABEL static lv_obj_t * perf_label = NULL; if(perf_label == NULL) { - perf_label = lv_label_create(lv_layer_sys(), NULL); + perf_label = lv_label_create(lv_layer_sys()); lv_obj_set_style_bg_opa(perf_label, LV_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_50); lv_obj_set_style_bg_color(perf_label, LV_PART_MAIN, LV_STATE_DEFAULT, lv_color_black()); lv_obj_set_style_text_color(perf_label, LV_PART_MAIN, LV_STATE_DEFAULT, lv_color_white()); @@ -249,7 +249,7 @@ void _lv_disp_refr_timer(lv_timer_t * tmr) lv_obj_set_style_pad_right(perf_label, LV_PART_MAIN, LV_STATE_DEFAULT, 3); lv_obj_set_style_text_align(perf_label, LV_PART_MAIN, LV_STATE_DEFAULT, LV_TEXT_ALIGN_RIGHT); lv_label_set_text(perf_label, "?"); - lv_obj_align(perf_label, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, 0, 0); + lv_obj_align(perf_label, LV_ALIGN_BOTTOM_RIGHT, 0, 0); } static uint32_t perf_last_time = 0; @@ -277,14 +277,13 @@ void _lv_disp_refr_timer(lv_timer_t * tmr) fps_sum_cnt ++; uint32_t cpu = 100 - lv_timer_get_idle(); lv_label_set_text_fmt(perf_label, "%d FPS\n%d%% CPU", fps, cpu); - lv_obj_align(perf_label, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, 0, 0); } #endif #if LV_USE_MEM_MONITOR && LV_MEM_CUSTOM == 0 && LV_USE_LABEL static lv_obj_t * mem_label = NULL; if(mem_label == NULL) { - mem_label = lv_label_create(lv_layer_sys(), NULL); + mem_label = lv_label_create(lv_layer_sys()); lv_obj_set_style_bg_opa(mem_label, LV_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_50); lv_obj_set_style_bg_color(mem_label, LV_PART_MAIN, LV_STATE_DEFAULT, lv_color_black()); lv_obj_set_style_text_color(mem_label, LV_PART_MAIN, LV_STATE_DEFAULT, lv_color_white()); @@ -293,7 +292,7 @@ void _lv_disp_refr_timer(lv_timer_t * tmr) lv_obj_set_style_pad_left(mem_label, LV_PART_MAIN, LV_STATE_DEFAULT, 3); lv_obj_set_style_pad_right(mem_label, LV_PART_MAIN, LV_STATE_DEFAULT, 3); lv_label_set_text(mem_label, "?"); - lv_obj_align(mem_label, NULL, LV_ALIGN_IN_BOTTOM_LEFT, 0, 0); + lv_obj_align(mem_label, LV_ALIGN_BOTTOM_LEFT, 0, 0); } static uint32_t mem_last_time = 0; @@ -305,7 +304,6 @@ void _lv_disp_refr_timer(lv_timer_t * tmr) uint32_t used_kb = used_size / 1024; uint32_t used_kb_tenth = (used_size - (used_kb * 1024)) / 102; lv_label_set_text_fmt(mem_label, "%d.%d kB used (%d %%)\n%d%% frag.", used_kb, used_kb_tenth, mon.used_pct, mon.frag_pct); - lv_obj_align(mem_label, NULL, LV_ALIGN_IN_BOTTOM_LEFT, 0, 0); } #endif diff --git a/tests/build.py b/tests/build.py index 12d318f25..da8116d3e 100755 --- a/tests/build.py +++ b/tests/build.py @@ -194,6 +194,9 @@ full_32bit = { "LV_USE_BIDI": 1, "LV_USE_ARABIC_PERSIAN_CHARS":1, + "LV_USE_PERF_MONITOR":1, + "LV_USE_MEM_MONITOR":1, + "LV_BUILD_EXAMPLES":1,