ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7535 from natinusala/ozone 

ozone: fix horizontal animation direction
This commit is contained in:
Twinaphex 2018-11-05 16:58:03 +01:00 committed by GitHub
parent 9a15354314 1a575dec7a
commit d34f96866e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
menu/drivers/ozone.c
View File

@ -539,7 +539,6 @@ typedef struct ozone_handle
file_list_t *selection_buf_old; file_list_t *selection_buf_old;
unsigned action;
bool draw_old_list; bool draw_old_list;
float scroll_old; float scroll_old;
@ -2814,10 +2813,12 @@ static void ozone_populate_entries(void *data, const char *path, const char *lab
} }
ozone->need_compute = true; ozone->need_compute = true;
ozone->fade_direction = ozone->action == MENU_ACTION_CANCEL;
int new_depth = (int)ozone_list_get_size(ozone, MENU_LIST_PLAIN);
ozone->depth = (int)ozone_list_get_size(ozone, MENU_LIST_PLAIN);
ozone->fade_direction = new_depth <= ozone->depth;
ozone->depth = new_depth;
if (ozone->categories_selection_ptr == ozone->categories_active_idx_old) if (ozone->categories_selection_ptr == ozone->categories_active_idx_old)
{ {
ozone_list_open(ozone); ozone_list_open(ozone);
@ -3045,8 +3046,6 @@ static int ozone_menu_iterate(menu_handle_t *menu, void *userdata, enum menu_act
break; break;
} }
ozone->action = new_action;
return generic_menu_iterate(menu, userdata, new_action); return generic_menu_iterate(menu, userdata, new_action);
} }