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

(XMB) Cleanups

This commit is contained in:
twinaphex 2015-02-02 20:40:29 +01:00
parent 47ee96b531
commit 6b09ac87f1
1 changed files with 62 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
menu/drivers/xmb.c
View File

@ -756,44 +756,55 @@ static void xmb_set_title(void)
} }
} }
static void xmb_list_open() static void xmb_list_open(void)
{ {
int dir;
unsigned j; unsigned j;
int dir = -1;
xmb_handle_t *xmb = (xmb_handle_t*)driver.menu->userdata; xmb_handle_t *xmb = (xmb_handle_t*)driver.menu->userdata;
if (!xmb) if (!xmb)
return; return;
dir = driver.menu->cat_selection_ptr > xmb->cat_selection_ptr_old ? 1 : -1; if (driver.menu->cat_selection_ptr > xmb->cat_selection_ptr_old)
dir = 1;
xmb->active_category += dir; xmb->active_category += dir;
for (j = 0; j < xmb->num_categories; j++) for (j = 0; j < xmb->num_categories; j++)
{ {
float ia, iz; float ia = xmb->c_passive_alpha;
float iz = xmb->c_passive_zoom;
xmb_node_t *node = j ? xmb_node_for_core(j-1) : &xmb->settings_node; xmb_node_t *node = j ? xmb_node_for_core(j-1) : &xmb->settings_node;
if (!node) if (!node)
continue; continue;
if (j == xmb->active_category)
{
ia = xmb->c_active_alpha;
iz = xmb->c_active_zoom;
}
ia = (j == xmb->active_category) ? xmb->c_active_alpha : xmb->c_passive_alpha;
iz = (j == xmb->active_category) ? xmb->c_active_zoom : xmb->c_passive_zoom;
add_tween(XMB_DELAY, ia, &node->alpha, &inOutQuad, NULL); add_tween(XMB_DELAY, ia, &node->alpha, &inOutQuad, NULL);
add_tween(XMB_DELAY, iz, &node->zoom, &inOutQuad, NULL); add_tween(XMB_DELAY, iz, &node->zoom, &inOutQuad, NULL);
} }
add_tween(XMB_DELAY, xmb->hspacing*-(float)driver.menu->cat_selection_ptr, &xmb->categories_x, &inOutQuad, NULL); add_tween(XMB_DELAY, xmb->hspacing * -(float)driver.menu->cat_selection_ptr,
dir = driver.menu->cat_selection_ptr > xmb->cat_selection_ptr_old ? 1 : -1; &xmb->categories_x, &inOutQuad, NULL);
dir = -1;
if (driver.menu->cat_selection_ptr > xmb->cat_selection_ptr_old)
dir = 1;
xmb_list_switch_old(xmb->selection_buf_old, dir, xmb->selection_ptr_old); xmb_list_switch_old(xmb->selection_buf_old, dir, xmb->selection_ptr_old);
xmb_list_switch_new(driver.menu->menu_list->selection_buf, dir, driver.menu->selection_ptr); xmb_list_switch_new(driver.menu->menu_list->selection_buf, dir, driver.menu->selection_ptr);
xmb->active_category_old = driver.menu->cat_selection_ptr; xmb->active_category_old = driver.menu->cat_selection_ptr;
} }
static void xmb_list_switch() static void xmb_list_switch(void)
{ {
int dir;
unsigned j; unsigned j;
int dir = 0;
xmb_handle_t *xmb = (xmb_handle_t*)driver.menu->userdata; xmb_handle_t *xmb = (xmb_handle_t*)driver.menu->userdata;
if (!xmb) if (!xmb)
@ -801,7 +812,6 @@ static void xmb_list_switch()
xmb->depth = file_list_get_size(driver.menu->menu_list->menu_stack); xmb->depth = file_list_get_size(driver.menu->menu_list->menu_stack);
dir = 0;
if (xmb->depth > xmb->old_depth) if (xmb->depth > xmb->old_depth)
dir = 1; dir = 1;
else if (xmb->depth < xmb->old_depth) else if (xmb->depth < xmb->old_depth)
@ -809,14 +819,17 @@ static void xmb_list_switch()
for (j = 0; j < xmb->num_categories; j++) for (j = 0; j < xmb->num_categories; j++)
{ {
float ia; float ia = 0;
xmb_node_t *node = j ? xmb_node_for_core(j-1) : &xmb->settings_node; xmb_node_t *node = j ? xmb_node_for_core(j-1) : &xmb->settings_node;
if (!node) if (!node)
continue; continue;
ia = (j == xmb->active_category) ? xmb->c_active_alpha if (j == xmb->active_category)
: (xmb->depth <= 1) ? xmb->c_passive_alpha : 0; ia = xmb->c_active_alpha;
else if (xmb->depth <= 1)
ia = xmb->c_passive_alpha;
add_tween(XMB_DELAY, ia, &node->alpha, &inOutQuad, NULL); add_tween(XMB_DELAY, ia, &node->alpha, &inOutQuad, NULL);
} }
@ -885,6 +898,7 @@ static void xmb_draw_items(file_list_t *list, file_list_t *stack,
for (i = 0; i < end; i++) for (i = 0; i < end; i++)
{ {
float icon_x, icon_y;
char type_str[PATH_MAX_LENGTH], path_buf[PATH_MAX_LENGTH]; char type_str[PATH_MAX_LENGTH], path_buf[PATH_MAX_LENGTH];
char name[256], value[256]; char name[256], value[256];
const char *path = NULL, *entry_label = NULL; const char *path = NULL, *entry_label = NULL;
@ -892,7 +906,6 @@ static void xmb_draw_items(file_list_t *list, file_list_t *stack,
xmb_node_t *node = NULL; xmb_node_t *node = NULL;
menu_file_list_cbs_t *cbs = NULL; menu_file_list_cbs_t *cbs = NULL;
GLuint icon = 0; GLuint icon = 0;
float icon_x, icon_y;
menu_list_get_at_offset(list, i, &path, &entry_label, &type); menu_list_get_at_offset(list, i, &path, &entry_label, &type);
node = (xmb_node_t*)file_list_get_userdata_at_offset(list, i); node = (xmb_node_t*)file_list_get_userdata_at_offset(list, i);
@ -959,9 +972,9 @@ static void xmb_draw_items(file_list_t *list, file_list_t *stack,
icon = xmb->textures[XMB_TEXTURE_RELOAD].id; icon = xmb->textures[XMB_TEXTURE_RELOAD].id;
break; break;
case MENU_SETTING_ACTION: case MENU_SETTING_ACTION:
icon = (xmb->depth == 3) ? icon = xmb->textures[XMB_TEXTURE_SETTING].id;
xmb->textures[XMB_TEXTURE_SUBSETTING].id : if (xmb->depth == 3)
xmb->textures[XMB_TEXTURE_SETTING].id; icon = xmb->textures[XMB_TEXTURE_SUBSETTING].id;
break; break;
case MENU_SETTING_GROUP: case MENU_SETTING_GROUP:
icon = xmb->textures[XMB_TEXTURE_SETTING].id; icon = xmb->textures[XMB_TEXTURE_SETTING].id;
@ -1396,11 +1409,11 @@ static void xmb_context_reset(void *data)
"off.png", sizeof(xmb->textures[XMB_TEXTURE_SWITCH_OFF].path)); "off.png", sizeof(xmb->textures[XMB_TEXTURE_SWITCH_OFF].path));
for (k = 0; k < XMB_TEXTURE_LAST; k++) for (k = 0; k < XMB_TEXTURE_LAST; k++)
xmb->textures[k].id = xmb_png_texture_load(xmb->textures[k].path); xmb->textures[k].id = xmb_png_texture_load(xmb->textures[k].path);
xmb->settings_node.icon = xmb->textures[XMB_TEXTURE_SETTINGS].id; xmb->settings_node.icon = xmb->textures[XMB_TEXTURE_SETTINGS].id;
xmb->settings_node.alpha = xmb->c_active_alpha; xmb->settings_node.alpha = xmb->c_active_alpha;
xmb->settings_node.zoom = xmb->c_active_zoom; xmb->settings_node.zoom = xmb->c_active_zoom;
info_list = (core_info_list_t*)g_extern.core_info; info_list = (core_info_list_t*)g_extern.core_info;
@ -1447,7 +1460,7 @@ static void xmb_context_reset(void *data)
if (i == xmb->active_category) if (i == xmb->active_category)
{ {
node->alpha = xmb->c_active_alpha; node->alpha = xmb->c_active_alpha;
node->zoom = xmb->c_active_zoom; node->zoom = xmb->c_active_zoom;
} }
else if (xmb->depth <= 1) else if (xmb->depth <= 1)
node->alpha = xmb->c_passive_alpha; node->alpha = xmb->c_passive_alpha;
@ -1588,7 +1601,16 @@ static void xmb_list_cache(bool horizontal, unsigned action)
return; return;
xmb->cat_selection_ptr_old = driver.menu->cat_selection_ptr; xmb->cat_selection_ptr_old = driver.menu->cat_selection_ptr;
driver.menu->cat_selection_ptr += action == MENU_ACTION_LEFT ? -1 : 1;
switch (action)
{
case MENU_ACTION_LEFT:
driver.menu->cat_selection_ptr--;
break;
default:
driver.menu->cat_selection_ptr++;
break;
}
stack_size = driver.menu->menu_list->menu_stack->size; stack_size = driver.menu->menu_list->menu_stack->size;
@ -1597,13 +1619,13 @@ static void xmb_list_cache(bool horizontal, unsigned action)
driver.menu->menu_list->menu_stack->list[stack_size-1].type = driver.menu->menu_list->menu_stack->list[stack_size-1].type =
MENU_SETTINGS; MENU_SETTINGS;
if (driver.menu->cat_selection_ptr != 0) if (driver.menu->cat_selection_ptr == 0)
{ return;
strlcpy(driver.menu->menu_list->menu_stack->list[stack_size-1].label,
"Horizontal Menu", PATH_MAX_LENGTH); strlcpy(driver.menu->menu_list->menu_stack->list[stack_size-1].label,
driver.menu->menu_list->menu_stack->list[stack_size-1].type = "Horizontal Menu", PATH_MAX_LENGTH);
MENU_SETTING_HORIZONTAL_MENU; driver.menu->menu_list->menu_stack->list[stack_size-1].type =
} MENU_SETTING_HORIZONTAL_MENU;
} }
static void xmb_list_set_selection(void *data) static void xmb_list_set_selection(void *data)
@ -1676,10 +1698,16 @@ static void xmb_toggle(bool menu_on)
if (!node) if (!node)
continue; continue;
node->alpha = (i == xmb->active_category) ? xmb->c_active_alpha node->alpha = 0;
: (xmb->depth <= 1) ? xmb->c_passive_alpha : 0; node->zoom = xmb->c_passive_zoom;
node->zoom = (i == xmb->active_category) ? xmb->c_active_zoom
: xmb->c_passive_zoom; if (i == xmb->active_category)
{
node->alpha = xmb->c_active_alpha;
node->zoom = xmb->c_active_zoom;
}
else if (xmb->depth <= 1)
node->alpha = xmb->c_passive_alpha;
} }
} }