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

Create menu_entry_get_spacing

Browse Source
This commit is contained in:
twinaphex 2015-06-01 15:13:49 +02:00
parent 26c75a8a1c
commit ee6f54baa7
5 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
menu/drivers/glui.c
View File

@ -293,13 +293,11 @@ static void glui_render_menu_list(glui_handle_t *glui,
for (i = 0; i < end; i++) for (i = 0; i < end; i++)
{ {
unsigned y; unsigned y;
menu_entry_t entry;
char entry_label[PATH_MAX_LENGTH], entry_value[PATH_MAX_LENGTH]; char entry_label[PATH_MAX_LENGTH], entry_value[PATH_MAX_LENGTH];
char message[PATH_MAX_LENGTH], char message[PATH_MAX_LENGTH],
entry_title_buf[PATH_MAX_LENGTH], type_str_buf[PATH_MAX_LENGTH]; entry_title_buf[PATH_MAX_LENGTH], type_str_buf[PATH_MAX_LENGTH];
bool selected = false; bool selected = false;
menu_entry_get(&entry, i, NULL, true);
selected = menu_entry_is_currently_selected(i); selected = menu_entry_is_currently_selected(i);
menu_entry_get_value(i, entry_value, sizeof(entry_value)); menu_entry_get_value(i, entry_value, sizeof(entry_value));
menu_entry_get_label(i, entry_label, sizeof(entry_label)); menu_entry_get_label(i, entry_label, sizeof(entry_label));

25
menu/drivers/rgui.c
View File

@ -441,14 +441,11 @@ static void rgui_render(void)
for (; i < end; i++, y += FONT_HEIGHT_STRIDE) for (; i < end; i++, y += FONT_HEIGHT_STRIDE)
{ {
menu_entry_t entry;
char entry_label[PATH_MAX_LENGTH], entry_value[PATH_MAX_LENGTH]; char entry_label[PATH_MAX_LENGTH], entry_value[PATH_MAX_LENGTH];
char message[PATH_MAX_LENGTH], char message[PATH_MAX_LENGTH],
entry_title_buf[PATH_MAX_LENGTH], type_str_buf[PATH_MAX_LENGTH]; entry_title_buf[PATH_MAX_LENGTH], type_str_buf[PATH_MAX_LENGTH];
bool selected = false; unsigned entry_spacing = menu_entry_get_spacing(i);
bool entry_selected = menu_entry_is_currently_selected(i);
menu_entry_get(&entry, i, NULL, true);
selected = menu_entry_is_currently_selected(i);
if (i > (menu->navigation.selection_ptr + 100)) if (i > (menu->navigation.selection_ptr + 100))
continue; continue;
@ -456,21 +453,21 @@ static void rgui_render(void)
menu_entry_get_value(i, entry_value, sizeof(entry_value)); menu_entry_get_value(i, entry_value, sizeof(entry_value));
menu_entry_get_label(i, entry_label, sizeof(entry_label)); menu_entry_get_label(i, entry_label, sizeof(entry_label));
menu_animation_ticker_line(entry_title_buf, RGUI_TERM_WIDTH - (entry.spacing + 1 + 2), menu_animation_ticker_line(entry_title_buf, RGUI_TERM_WIDTH - (entry_spacing + 1 + 2),
frame_count / RGUI_TERM_START_X, entry_label, selected); frame_count / RGUI_TERM_START_X, entry_label, entry_selected);
menu_animation_ticker_line(type_str_buf, entry.spacing, menu_animation_ticker_line(type_str_buf, entry_spacing,
frame_count / RGUI_TERM_START_X, frame_count / RGUI_TERM_START_X,
entry_value, selected); entry_value, entry_selected);
snprintf(message, sizeof(message), "%c %-*.*s %-*s", snprintf(message, sizeof(message), "%c %-*.*s %-*s",
selected ? '>' : ' ', entry_selected ? '>' : ' ',
RGUI_TERM_WIDTH - (entry.spacing + 1 + 2), RGUI_TERM_WIDTH - (entry_spacing + 1 + 2),
RGUI_TERM_WIDTH - (entry.spacing + 1 + 2), RGUI_TERM_WIDTH - (entry_spacing + 1 + 2),
entry_title_buf, entry_title_buf,
entry.spacing, entry_spacing,
type_str_buf); type_str_buf);
blit_line(menu, x, y, message, selected ? hover_color : normal_color); blit_line(menu, x, y, message, entry_selected ? hover_color : normal_color);
} }
#ifdef GEKKO #ifdef GEKKO

16
menu/drivers/rmenu.c
View File

@ -189,24 +189,22 @@ static void rmenu_render(void)
for (i = begin; i < end; i++, j++) for (i = begin; i < end; i++, j++)
{ {
menu_entry_t entry;
char entry_label[PATH_MAX_LENGTH], entry_value[PATH_MAX_LENGTH]; char entry_label[PATH_MAX_LENGTH], entry_value[PATH_MAX_LENGTH];
char message[PATH_MAX_LENGTH], char message[PATH_MAX_LENGTH],
entry_title_buf[PATH_MAX_LENGTH], type_str_buf[PATH_MAX_LENGTH]; entry_title_buf[PATH_MAX_LENGTH], type_str_buf[PATH_MAX_LENGTH];
bool selected = false; unsigned entry_spacing = menu_entry_get_spacing(i);
bool entry_selected = menu_entry_is_currently_selected(i);
menu_entry_get(&entry, i, NULL, true);
selected = menu_entry_is_currently_selected(i);
menu_entry_get_value(i, entry_value, sizeof(entry_value)); menu_entry_get_value(i, entry_value, sizeof(entry_value));
menu_entry_get_label(i, entry_label, sizeof(entry_label)); menu_entry_get_label(i, entry_label, sizeof(entry_label));
menu_animation_ticker_line(entry_title_buf, RMENU_TERM_WIDTH - (entry.spacing + 1 + 2), menu_animation_ticker_line(entry_title_buf, RMENU_TERM_WIDTH - (entry_spacing + 1 + 2),
frame_count / 15, entry_label, selected); frame_count / 15, entry_label, entry_selected);
menu_animation_ticker_line(type_str_buf, entry.spacing, menu_animation_ticker_line(type_str_buf, entry_spacing,
frame_count / 15, entry_value, selected); frame_count / 15, entry_value, entry_selected);
snprintf(message, sizeof(message), "%c %s", snprintf(message, sizeof(message), "%c %s",
selected ? '>' : ' ', entry_title_buf); entry_selected ? '>' : ' ', entry_title_buf);
font_parms.x = POSITION_EDGE_MIN + POSITION_OFFSET; font_parms.x = POSITION_EDGE_MIN + POSITION_OFFSET;
font_parms.y = POSITION_EDGE_MIN + POSITION_RENDER_OFFSET font_parms.y = POSITION_EDGE_MIN + POSITION_RENDER_OFFSET

8
menu/menu_entry.c
View File

@ -201,6 +201,14 @@ void menu_entry_get_label(uint32_t i, char *label, size_t sizeof_label)
strlcpy(label, entry.path, sizeof_label); strlcpy(label, entry.path, sizeof_label);
} }
unsigned menu_entry_get_spacing(uint32_t i)
{
menu_entry_t entry;
menu_entry_get(&entry, i, NULL, true);
return entry.spacing;
}
uint32_t menu_entry_get_bool_value(uint32_t i) uint32_t menu_entry_get_bool_value(uint32_t i)
{ {
rarch_setting_t *setting = menu_entry_get_setting(i); rarch_setting_t *setting = menu_entry_get_setting(i);

2
menu/menu_entry.h
View File

@ -65,6 +65,8 @@ enum menu_entry_type menu_entry_get_type(uint32_t i);
void menu_entry_get_label(uint32_t i, char *label, size_t sizeof_label); void menu_entry_get_label(uint32_t i, char *label, size_t sizeof_label);
unsigned menu_entry_get_spacing(uint32_t i);
uint32_t menu_entry_get_bool_value(uint32_t i); uint32_t menu_entry_get_bool_value(uint32_t i);
void menu_entry_set_bool_value(uint32_t i, uint32_t new_val); void menu_entry_set_bool_value(uint32_t i, uint32_t new_val);