From 81e4ef67d04534cd5f2c8eed2671c4e1c6e24984 Mon Sep 17 00:00:00 2001 From: leo Date: Thu, 10 Aug 2023 16:11:27 +0200 Subject: [PATCH] removed screan fade in --- Core/Src/PSE_unit_edit_screen.c | 6 ++++-- Core/Src/home_screen.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Core/Src/PSE_unit_edit_screen.c b/Core/Src/PSE_unit_edit_screen.c index 3995c08..d78fc17 100644 --- a/Core/Src/PSE_unit_edit_screen.c +++ b/Core/Src/PSE_unit_edit_screen.c @@ -21,7 +21,9 @@ static void back_button_handler(lv_event_t * e){ if(code == LV_EVENT_CLICKED) { // Save - lv_scr_load_anim(parent_screen, LV_SCR_LOAD_ANIM_FADE_ON, 100, 100, true); + lv_obj_t* curr_scr = lv_scr_act(); + lv_scr_load(parent_screen); + lv_obj_del(curr_scr); } } @@ -147,5 +149,5 @@ void PSE_unit_edit_screen_Gen(lv_obj_t* parent, pse_unit* unit){ lv_obj_set_grid_cell(controls, LV_GRID_ALIGN_CENTER, 3, 1, LV_GRID_ALIGN_CENTER, 0, 1); // fade in the new screen - lv_scr_load_anim(scr, LV_SCR_LOAD_ANIM_FADE_ON, 100, 100, false); + lv_scr_load(scr); } diff --git a/Core/Src/home_screen.c b/Core/Src/home_screen.c index 241fde2..52938c6 100644 --- a/Core/Src/home_screen.c +++ b/Core/Src/home_screen.c @@ -140,5 +140,5 @@ void Home_Screen_Gen(pse_unit* pse_units, uint8_t pse_unit_num){ } // fade in the new screen - lv_scr_load_anim(scr, LV_SCR_LOAD_ANIM_FADE_ON, 100, 100, false); + lv_scr_load_anim(scr, LV_SCR_LOAD_ANIM_FADE_ON, 500, 100, false); }