Skip to content

Commit 8163af1

Browse files
committed
fix anim last frame
1 parent 1e72ec1 commit 8163af1

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

fw/application/src/app/amiibo/scene/amiibo_scene_file_browser.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ static void amiibo_scene_file_browser_reload_folders(app_amiibo_t *app) {
6666
}
6767

6868
mui_list_view_sort(app->p_list_view, amiibo_scene_file_browser_list_item_cmp);
69+
mui_view_dispatcher_switch_to_view(app->p_view_dispatcher, AMIIBO_VIEW_ID_LIST);
6970
}
7071

7172
static void amiibo_scene_file_browser_on_selected(mui_list_view_event_t event, mui_list_view_t *p_list_view,
@@ -119,7 +120,6 @@ void amiibo_scene_file_browser_on_enter(void *user_data) {
119120
mui_list_view_set_focus(app->p_list_view, app->current_focus_index);
120121

121122
NRF_LOG_INFO("%X", app);
122-
mui_view_dispatcher_switch_to_view(app->p_view_dispatcher, AMIIBO_VIEW_ID_LIST);
123123
}
124124

125125
void amiibo_scene_file_browser_on_exit(void *user_data) {

fw/application/src/mui/mui_anim.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,13 @@ static void mui_anim_tick_handler() {
155155
p_anim->run_cnt = 0;
156156
}else {
157157
// reached end of animation
158+
if(p_anim->current_value != p_anim->end_value){
159+
p_anim->current_value = p_anim->end_value;
160+
p_anim->exec_cb(p_anim->var, p_anim->end_value);
161+
mui_update_required = true;
162+
NRF_LOG_INFO("ANIM FIX");
163+
}
164+
158165
mui_anim_ptr_array_remove(m_anim_ptr_array, it);
159166
}
160167
}

fw/application/src/mui/view/mui_list_view.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,7 @@ mui_list_view_t *mui_list_view_create() {
295295
mui_anim_set_values(&p_mui_list_view->gap_anim, 0, LIST_ITEM_HEIGHT);
296296
mui_anim_set_exec_cb(&p_mui_list_view->gap_anim, mui_list_view_gap_anim_exec);
297297
mui_anim_set_time(&p_mui_list_view->gap_anim, 200);
298+
p_mui_list_view->item_gap = mui_list_view_anim_enabled() ? 0 : LIST_ITEM_HEIGHT;
298299

299300
mui_list_item_array_init(p_mui_list_view->items);
300301

0 commit comments

Comments
 (0)