From d8890b486ad6f8c953ab7fe709fda1cb0d7a4e68 Mon Sep 17 00:00:00 2001 From: radius Date: Sun, 5 Jun 2016 22:32:07 -0500 Subject: [PATCH] [nk] implement extension filtering --- menu/drivers/nuklear.c | 2 +- menu/drivers/nuklear/nk_wnd_file_picker.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/menu/drivers/nuklear.c b/menu/drivers/nuklear.c index debd7efcda..6815405382 100644 --- a/menu/drivers/nuklear.c +++ b/menu/drivers/nuklear.c @@ -57,7 +57,7 @@ static void nk_menu_main(nk_menu_handle_t *nk) if (nk->window[NK_WND_SETTINGS].open) nk_wnd_settings(nk); if (nk->window[NK_WND_FILE_PICKER].open) - nk_wnd_file_picker(nk, NULL, NULL, NULL); + nk_wnd_file_picker(nk, settings->directory.menu_content, NULL, ".zip"); if (nk->window[NK_WND_SHADER_PARAMETERS].open) nk_wnd_shader_parameters(nk); if (nk->window[NK_WND_MAIN].open) diff --git a/menu/drivers/nuklear/nk_wnd_file_picker.c b/menu/drivers/nuklear/nk_wnd_file_picker.c index 109eaaf95c..c6227979a8 100644 --- a/menu/drivers/nuklear/nk_wnd_file_picker.c +++ b/menu/drivers/nuklear/nk_wnd_file_picker.c @@ -81,7 +81,7 @@ bool nk_wnd_file_picker(nk_menu_handle_t *nk, const char* in, const char* out, c { RARCH_LOG("beep\n"); strlcpy(path, in, sizeof(path)); - files = dir_list_new(path, NULL, true, true); + files = dir_list_new(path, filter, true, true); } if (!assets_loaded) @@ -100,7 +100,7 @@ bool nk_wnd_file_picker(nk_menu_handle_t *nk, const char* in, const char* out, c { fill_pathname_join(path, "/", "", sizeof(path)); - files = dir_list_new(path, NULL, true, true); + files = dir_list_new(path, filter, true, true); } } else @@ -112,7 +112,7 @@ bool nk_wnd_file_picker(nk_menu_handle_t *nk, const char* in, const char* out, c { fill_pathname_join(path, drives->list[i].path, "", sizeof(path)); - files = dir_list_new(path, NULL, true, true); + files = dir_list_new(path, filter, true, true); } } } @@ -128,7 +128,7 @@ bool nk_wnd_file_picker(nk_menu_handle_t *nk, const char* in, const char* out, c { strlcpy (path, files->elems[i].data, sizeof(path)); if (path_is_directory (path)) - files = dir_list_new(path, NULL, true, true); + files = dir_list_new(path, filter, true, true); else RARCH_LOG ("File: %s selected\n", path); }