From 9726de615bf13c8c15fbcda47c5e1f0b30b17e3a Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 16 Sep 2016 13:03:26 +0200 Subject: [PATCH] Fix stray icon --- menu/drivers/materialui.c | 2 +- menu/drivers/rgui.c | 2 +- menu/drivers/xmb.c | 2 +- menu/drivers/xui.cpp | 13 ++++--------- menu/drivers/zarch.c | 2 +- menu/widgets/menu_entry.c | 5 +++-- menu/widgets/menu_entry.h | 2 +- ui/drivers/cocoa/cocoatouch_menu.m | 2 +- 8 files changed, 13 insertions(+), 17 deletions(-) diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c index 0467a5fbaf..d1cae46ae0 100644 --- a/menu/drivers/materialui.c +++ b/menu/drivers/materialui.c @@ -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; diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c index 8802a43cb2..ae09d10b2a 100644 --- a/menu/drivers/rgui.c +++ b/menu/drivers/rgui.c @@ -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; diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index d7007865e1..22438f8186 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -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")) diff --git a/menu/drivers/xui.cpp b/menu/drivers/xui.cpp index d7eb9c09bd..dad913825a 100644 --- a/menu/drivers/xui.cpp +++ b/menu/drivers/xui.cpp @@ -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)); diff --git a/menu/drivers/zarch.c b/menu/drivers/zarch.c index 1de5ca572c..6eff103d7b 100644 --- a/menu/drivers/zarch.c +++ b/menu/drivers/zarch.c @@ -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, diff --git a/menu/widgets/menu_entry.c b/menu/widgets/menu_entry.c index 0a8d9e6e6b..ca12ab5a04 100644 --- a/menu/widgets/menu_entry.c +++ b/menu/widgets/menu_entry.c @@ -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); } diff --git a/menu/widgets/menu_entry.h b/menu/widgets/menu_entry.h index 8234d28134..7fe41cbe8c 100644 --- a/menu/widgets/menu_entry.h +++ b/menu/widgets/menu_entry.h @@ -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); diff --git a/ui/drivers/cocoa/cocoatouch_menu.m b/ui/drivers/cocoa/cocoatouch_menu.m index 9068ff9fd0..3f4b3839ee 100644 --- a/ui/drivers/cocoa/cocoatouch_menu.m +++ b/ui/drivers/cocoa/cocoatouch_menu.m @@ -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);