mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 06:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3079 from fr500/nuklear

Browse Source 
implement file selector
This commit is contained in:
Twinaphex 2016-06-06 06:14:19 +02:00
commit 3e3ceba9aa
3 changed files with 148 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
menu/drivers/nuklear.c
View File

@ -50,12 +50,23 @@
static void nk_menu_main(nk_menu_handle_t *nk)
{
settings_t *settings = config_get_ptr();
struct nk_context *ctx = &nk->ctx;
static char out[PATH_MAX_LENGTH];
if (nk->window[NK_WND_SETTINGS].open)
nk_wnd_settings(nk);
if (nk->window[NK_WND_FILE_PICKER].open)
nk_wnd_file_picker(nk);
{
if (nk_wnd_file_picker(nk, settings->directory.menu_content, out, ".zip"))
{
RARCH_LOG ("%s selected\n", out);
nk_window_close(&nk->ctx, "Select File");
}
}
if (nk->window[NK_WND_SHADER_PARAMETERS].open)
nk_wnd_shader_parameters(nk);
if (nk->window[NK_WND_MAIN].open)
@ -295,11 +306,12 @@ static void *nk_menu_init(void **userdata)
nk_menu_init_device(nk);
/* for demo puposes only, opens all windows */
#if 1
#if 0
for (int i=0; i < NK_WND_LAST; i++)
nk->window[i].open = true;
#else
nk->window[NK_WND_MAIN].open = true;
nk->window[NK_WND_FILE_PICKER].open = true;
#endif
return menu;

2
menu/drivers/nuklear/nk_menu.h
View File

@ -95,7 +95,7 @@ typedef struct nk_menu_handle
void nk_wnd_shader_parameters(nk_menu_handle_t *zr);
void nk_wnd_main(nk_menu_handle_t *zr);
void nk_wnd_file_picker(nk_menu_handle_t *zr);
bool nk_wnd_file_picker(nk_menu_handle_t *nk, const char* in, char* out, const char* filter);
void nk_wnd_settings(nk_menu_handle_t *zr);
void nk_wnd_set_state(nk_menu_handle_t *zr, const int id,
struct nk_vec2 pos, struct nk_vec2 size);

36
menu/drivers/nuklear/nk_wnd_file_picker.c
View File

@ -61,7 +61,7 @@ void load_icons(nk_menu_handle_t *nk)
assets_loaded = true;
}
void nk_wnd_file_picker(nk_menu_handle_t *nk)
bool nk_wnd_file_picker(nk_menu_handle_t *nk, const char* in, char* out, const char* filter)
{
struct nk_panel layout;
struct nk_context *ctx = &nk->ctx;
@ -70,6 +70,7 @@ void nk_wnd_file_picker(nk_menu_handle_t *nk)
static file_list_t *drives = NULL;
static struct string_list *files = NULL;
settings_t *settings = config_get_ptr();
bool ret = false;
if (!drives)
{
@ -77,14 +78,21 @@ void nk_wnd_file_picker(nk_menu_handle_t *nk)
frontend_driver_parse_drive_list(drives);
}
if (!string_is_empty(in) && string_is_empty(path))
{
RARCH_LOG("beep\n");
strlcpy(path, in, sizeof(path));
files = dir_list_new(path, filter, true, true);
}
if (!assets_loaded)
load_icons(nk);
if (nk_begin(ctx, &layout, "Select File", nk_rect(440, 10, 330, 400),
if (nk_begin(ctx, &layout, "Select File", nk_rect(10, 10, 500, 400),
NK_WINDOW_CLOSABLE|NK_WINDOW_MINIMIZABLE|NK_WINDOW_MOVABLE|
NK_WINDOW_BORDER))
{
nk_layout_row_dynamic(ctx, 30, 3);
nk_layout_row_dynamic(ctx, 30, 4);
if (drives->size == 0)
{
@ -93,7 +101,7 @@ void nk_wnd_file_picker(nk_menu_handle_t *nk)
{
fill_pathname_join(path, "/",
"", sizeof(path));
files = dir_list_new(path, NULL, true, true);
files = dir_list_new(path, filter, true, true);
}
}
else
@ -105,7 +113,7 @@ void nk_wnd_file_picker(nk_menu_handle_t *nk)
{
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);
}
}
}
@ -121,14 +129,26 @@ void nk_wnd_file_picker(nk_menu_handle_t *nk)
{
strlcpy (path, files->elems[i].data, sizeof(path));
if (path_is_directory (path))
files = dir_list_new(path, NULL, true, true);
else
RARCH_LOG ("File: %s selected\n", path);
files = dir_list_new(path, filter, true, true);
}
}
}
nk_layout_row_dynamic(ctx, 30, 1);
{
if (nk_button_text(ctx, "OK", 2, NK_BUTTON_DEFAULT))
ret = true;
}
}
/* sort the dir list with directories first */
dir_list_sort(files, true);
/* copy the path variable to out*/
strlcpy(out, path, sizeof(path));
/* save position and size to restore after context reset */
nk_wnd_set_state(nk, id, nk_window_get_position(ctx), nk_window_get_size(ctx));
nk_end(ctx);
return ret;
}