Fix stray icon

This commit is contained in:
twinaphex 2016-09-16 13:03:26 +02:00
parent 574d51d1e0
commit 9726de615b
8 changed files with 13 additions and 17 deletions

View File

@ -675,7 +675,7 @@ static void mui_render_menu_list(mui_handle_t *mui,
|| ((y + (int)mui->line_height) < 0))
continue;
menu_entry_get_value(i, entry_value, sizeof(entry_value));
menu_entry_get_value(i, NULL, entry_value, sizeof(entry_value));
menu_entry_get_rich_label(i, rich_label, sizeof(rich_label));
entry_selected = selection == i;

View File

@ -582,7 +582,7 @@ static void rgui_render(void *data)
entry_title_buf[0] = '\0';
type_str_buf[0] = '\0';
menu_entry_get_value(i, entry_value, sizeof(entry_value));
menu_entry_get_value(i, NULL, entry_value, sizeof(entry_value));
menu_entry_get_rich_label(i, entry_path, sizeof(entry_path));
ticker.s = entry_title_buf;

View File

@ -1805,7 +1805,7 @@ static void xmb_draw_items(xmb_handle_t *xmb,
fill_short_pathname_representation(entry.path, entry.path,
sizeof(entry.path));
menu_entry_get_value(i, entry_value, sizeof(entry_value));
menu_entry_get_value(i, list, entry_value, sizeof(entry_value));
if (string_is_equal(entry_value, "disabled") ||
string_is_equal(entry_value, "off"))

View File

@ -525,19 +525,14 @@ static void xui_set_list_text(int index, const wchar_t* leftText,
static void xui_render(void *data)
{
uint64_t *frame_count;
unsigned fb_width;
size_t end, i, selection;
char title[PATH_MAX_LENGTH] = {0};
bool msg_force = false;
const char *dir = NULL;
const char *label = NULL;
unsigned menu_type = 0;
frame_count = video_driver_get_frame_count_ptr();
fb_width = menu_display_get_width();
msg_force = menu_display_get_msg_force();
uint64_t *frame_count = video_driver_get_frame_count_ptr();
unsigned fb_width = menu_display_get_width();
bool msg_force = menu_display_get_msg_force();
if (
menu_entries_ctl(MENU_ENTRIES_CTL_NEEDS_REFRESH, NULL)
@ -577,7 +572,7 @@ static void xui_render(void *data)
wchar_t msg_right[PATH_MAX_LENGTH] = {0};
wchar_t msg_left[PATH_MAX_LENGTH] = {0};
menu_entry_get_value(i, entry_value, sizeof(entry_value));
menu_entry_get_value(i, NULL, entry_value, sizeof(entry_value));
menu_entry_get_path(i, entry_path, sizeof(entry_path));
mbstowcs(msg_left, entry_path, sizeof(msg_left) / sizeof(wchar_t));

View File

@ -518,7 +518,7 @@ static int zarch_zui_render_lay_root_recent(zui_t *zui, struct zui_tabbed *tabbe
menu_entry_get(&entry, 0, i, NULL, true);
menu_entry_get_rich_label(i, rich_label, sizeof(rich_label));
menu_entry_get_value(i, entry_value,sizeof(entry_value));
menu_entry_get_value(i, NULL, entry_value,sizeof(entry_value));
if (zarch_zui_list_item(zui, tabbed, 0,
tabbed->tabline_size + j * ZUI_ITEM_SIZE_PX,

View File

@ -233,10 +233,11 @@ void menu_entry_reset(uint32_t i)
menu_entry_action(&entry, i, MENU_ACTION_START);
}
void menu_entry_get_value(uint32_t i, char *s, size_t len)
void menu_entry_get_value(uint32_t i, void *data, char *s, size_t len)
{
file_list_t *list = (void*)data;
menu_entry_t entry = {{0}};
menu_entry_get(&entry, 0, i, NULL, true);
menu_entry_get(&entry, 0, i, list, true);
strlcpy(s, entry.value, len);
}

View File

@ -94,7 +94,7 @@ void menu_entry_reset(uint32_t i);
void menu_entry_get_rich_label(uint32_t i, char *s, size_t len);
void menu_entry_get_value(uint32_t i, char *s, size_t len);
void menu_entry_get_value(uint32_t i, void *data, char *s, size_t len);
void menu_entry_set_value(uint32_t i, const char *s);

View File

@ -121,7 +121,7 @@ static void RunActionSheet(const char* title, const struct string_list* items,
reuseIdentifier:cell_id];
menu_entry_get_path(self.i, label, sizeof(label));
menu_entry_get_value(self.i, buffer, sizeof(buffer));
menu_entry_get_value(self.i, NULL, buffer, sizeof(buffer));
result.textLabel.text = BOXSTRING(label);