mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-11 15:40:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

(XMB) Fix another display bug

Browse Source
This commit is contained in:
Jean-André Santoni 2014-11-27 17:07:52 +07:00
parent 6393badfb5
commit 5fd2a852ca
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
menu/disp/xmb.c
View File

@ -513,8 +513,8 @@ static void xmb_list_open_new(file_list_t *list, int dir, size_t current)
if (!xmb) if (!xmb)
continue; continue;
float ia = (i == current) ? 1.0 : 0.5; float ia = i == current ? xmb->i_active_alpha : xmb->i_passive_alpha;
add_tween(XMB_DELAY, ia, &node->alpha, &inOutQuad, NULL); add_tween(XMB_DELAY, ia, &node->alpha, &inOutQuad, NULL);
add_tween(XMB_DELAY, ia, &node->label_alpha, &inOutQuad, NULL); add_tween(XMB_DELAY, ia, &node->label_alpha, &inOutQuad, NULL);
add_tween(XMB_DELAY, 0, &node->x, &inOutQuad, NULL); add_tween(XMB_DELAY, 0, &node->x, &inOutQuad, NULL);
@ -768,7 +768,7 @@ static void xmb_populate_entries(void *data, const char *path,
} }
static void xmb_draw_items(file_list_t *list, file_list_t *stack, static void xmb_draw_items(file_list_t *list, file_list_t *stack,
size_t current) size_t current, size_t cat_selection_ptr)
{ {
unsigned i; unsigned i;
const char *dir = NULL; const char *dir = NULL;
@ -782,6 +782,9 @@ static void xmb_draw_items(file_list_t *list, file_list_t *stack,
file_list_get_last(stack, &dir, &label, &menu_type); file_list_get_last(stack, &dir, &label, &menu_type);
xmb_node_t *core_node = xmb->active_category ?
xmb_node_for_core(cat_selection_ptr - 1) : NULL;
for (i = 0; i < end; i++) for (i = 0; i < end; i++)
{ {
char val_buf[PATH_MAX], path_buf[PATH_MAX]; char val_buf[PATH_MAX], path_buf[PATH_MAX];
@ -798,9 +801,6 @@ static void xmb_draw_items(file_list_t *list, file_list_t *stack,
entry_label, path, entry_label, path,
path_buf, sizeof(path_buf)); path_buf, sizeof(path_buf));
xmb_node_t* core_node = xmb->active_category ?
xmb_node_for_core(driver.menu->cat_selection_ptr - 1) : NULL;
GLuint icon = 0; GLuint icon = 0;
switch(type) switch(type)
{ {
@ -909,7 +909,7 @@ static void xmb_draw_items(file_list_t *list, file_list_t *stack,
static void xmb_frame(void) static void xmb_frame(void)
{ {
int i; int i, depth;
char title_msg[64]; char title_msg[64];
xmb_handle_t *xmb = (xmb_handle_t*)driver.menu->userdata; xmb_handle_t *xmb = (xmb_handle_t*)driver.menu->userdata;
@ -951,14 +951,19 @@ static void xmb_frame(void)
0, 0,
1); 1);
depth = file_list_get_size(driver.menu->menu_list->menu_stack);
xmb_draw_items( xmb_draw_items(
driver.menu->menu_list->selection_buf_old, driver.menu->menu_list->selection_buf_old,
driver.menu->menu_list->menu_stack_old, driver.menu->menu_list->menu_stack_old,
driver.menu->selection_ptr_old); driver.menu->selection_ptr_old,
depth > 1 ? driver.menu->cat_selection_ptr :
driver.menu->cat_selection_ptr_old);
xmb_draw_items( xmb_draw_items(
driver.menu->menu_list->selection_buf, driver.menu->menu_list->selection_buf,
driver.menu->menu_list->menu_stack, driver.menu->menu_list->menu_stack,
driver.menu->selection_ptr); driver.menu->selection_ptr,
driver.menu->cat_selection_ptr);
for (i = 0; i < xmb->num_categories; i++) for (i = 0; i < xmb->num_categories; i++)
{ {