CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-21 10:20:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(Zarch) Cleanups

Browse Source
This commit is contained in:
twinaphex 2015-10-27 06:11:51 +01:00
parent 9cae5d4493
commit 4afc123c84
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
menu/drivers/zarch.c
View File

@ -160,9 +160,9 @@ typedef struct zarch_handle
int font_size;
int header_height;
unsigned pending_selection;
unsigned next_id_sel;
unsigned prev_id_sel;
unsigned active_id_sel;
unsigned next_id;
unsigned active_id;
unsigned prev_id;
bool next_selection_set;
} zui_t;
@ -481,30 +481,30 @@ static bool zarch_zui_list_item(zui_t *zui, zui_tabbed_t *tab, int x1, int y1,
if (tab->active_id != tab->prev_id)
{
zui->active_id_sel = item_id;
zui->active_id = item_id;
tab->prev_id = tab->active_id;
}
if (zui->pending_selection == -1)
{
if (item_id < zui->active_id_sel)
zui->prev_id_sel = item_id;
if (item_id > zui->active_id_sel && !zui->next_selection_set)
if (item_id < zui->active_id)
zui->prev_id = item_id;
if (item_id > zui->active_id && !zui->next_selection_set)
{
zui->next_id_sel = item_id;
zui->next_id = item_id;
zui->next_selection_set = true;
}
}
else
{
if (zui->active_id_sel != item_id && zui->pending_selection == item_id)
zui->active_id_sel = item_id;
if (zui->active_id != item_id && zui->pending_selection == item_id)
zui->active_id = item_id;
}
if (zui->item.active == id || zui->item.hot == id)
bg = ZUI_BG_HILITE;
else if (zui->active_id_sel == item_id)
else if (zui->active_id == item_id)
bg = ZUI_BG_PAD_HILITE;
ticker_size = x2 / 14;
@ -799,17 +799,17 @@ static int zarch_zui_render_lay_root(zui_t *zui)
switch (zui->action)
{
case MENU_ACTION_UP:
if (zui->prev_id_sel != -1 && zui->prev_id_sel != zui->active_id_sel)
if (zui->prev_id != -1 && zui->prev_id != zui->active_id)
{
if (zui->prev_id_sel < zui->active_id_sel)
zui->pending_selection = zui->prev_id_sel;
if (zui->prev_id < zui->active_id)
zui->pending_selection = zui->prev_id;
}
break;
case MENU_ACTION_DOWN:
if (zui->next_id_sel != -1 && zui->next_id_sel != zui->active_id_sel)
if (zui->next_id != -1 && zui->next_id != zui->active_id)
{
if (zui->next_id_sel > zui->active_id_sel)
zui->pending_selection = zui->next_id_sel;
if (zui->next_id > zui->active_id)
zui->pending_selection = zui->next_id;
}
break;
default:
@ -912,7 +912,7 @@ static int zarch_zui_render_pick_core(zui_t *zui)
if (!zui->pick_supported)
{
zarch_zui_list_item(zui, &tabbed, 0, 54, "Content unsupported", 0, NULL /* TODO/FIXME */);
zui->active_id_sel = 0;
zui->active_id = 0;
return 1;
}