mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing wrong settings in Nuklear

Browse Source
This commit is contained in:
allanin 2017-06-18 05:57:08 +00:00
parent e6a1afdb22
commit c990a57359
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
menu/drivers/nuklear.c
View File

@ -166,7 +166,7 @@ static void *nk_menu_init(void **userdata, bool video_is_threaded)
goto error; goto error;
*userdata = nk; *userdata = nk;
fill_pathname_join(nk->assets_directory, settings->directory.assets, fill_pathname_join(nk->assets_directory, settings->paths.directory_assets,
"nuklear", sizeof(nk->assets_directory)); "nuklear", sizeof(nk->assets_directory));
nk_menu_init_device(nk); nk_menu_init_device(nk);
@ -430,15 +430,15 @@ static void nk_menu_context_reset(void *data, bool is_threaded)
if (!nk || !settings) if (!nk || !settings)
return; return;
fill_pathname_join(iconpath, settings->directory.assets, fill_pathname_join(iconpath, settings->paths.directory_assets,
"nuklear", sizeof(iconpath)); "nuklear", sizeof(iconpath));
fill_pathname_slash(iconpath, sizeof(iconpath)); fill_pathname_slash(iconpath, sizeof(iconpath));
nk_menu_init_device(nk); nk_menu_init_device(nk);
nk_menu_context_load_textures(nk, iconpath); nk_menu_context_load_textures(nk, iconpath);
if (path_file_exists(settings->path.menu_wallpaper)) if (path_file_exists(settings->paths.path_menu_wallpaper))
task_push_image_load(settings->path.menu_wallpaper, task_push_image_load(settings->paths.path_menu_wallpaper,
menu_display_handle_wallpaper_upload, NULL); menu_display_handle_wallpaper_upload, NULL);
} }

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

@ -81,7 +81,7 @@ bool nk_wnd_file_picker(nk_menu_handle_t *nk, char* title, char* in, char* out,
if (!string_is_empty(in) && string_is_empty(path)) if (!string_is_empty(in) && string_is_empty(path))
{ {
strlcpy(path, in, sizeof(path)); strlcpy(path, in, sizeof(path));
files = dir_list_new(path, filter, true, settings->show_hidden_files, true, false); files = dir_list_new(path, filter, true, settings->bools.show_hidden_files, true, false);
} }
if (!assets_loaded) if (!assets_loaded)
@ -100,7 +100,7 @@ bool nk_wnd_file_picker(nk_menu_handle_t *nk, char* title, char* in, char* out,
{ {
fill_pathname_join(path, "/", fill_pathname_join(path, "/",
"", sizeof(path)); "", sizeof(path));
files = dir_list_new(path, filter, true, settings->show_hidden_files, true, false); files = dir_list_new(path, filter, true, settings->bools.show_hidden_files, true, false);
} }
} }
else else
@ -112,7 +112,7 @@ bool nk_wnd_file_picker(nk_menu_handle_t *nk, char* title, char* in, char* out,
{ {
fill_pathname_join(path, drives->list[i].path, fill_pathname_join(path, drives->list[i].path,
"", sizeof(path)); "", sizeof(path));
files = dir_list_new(path, filter, true, settings->show_hidden_files, true, false); files = dir_list_new(path, filter, true, settings->bools.show_hidden_files, true, false);
} }
} }
} }
@ -128,7 +128,7 @@ bool nk_wnd_file_picker(nk_menu_handle_t *nk, char* title, char* in, char* out,
{ {
strlcpy (path, files->elems[i].data, sizeof(path)); strlcpy (path, files->elems[i].data, sizeof(path));
if (path_is_directory (path)) if (path_is_directory (path))
files = dir_list_new(path, filter, true, settings->show_hidden_files, true, false); files = dir_list_new(path, filter, true, settings->bools.show_hidden_files, true, false);
} }
} }
} }

4
menu/drivers/nuklear/nk_wnd_main.c
View File

@ -84,7 +84,7 @@ void nk_wnd_main(nk_menu_handle_t *nk, const char* title)
out = core; out = core;
strlcpy(picker_title, "Select core", sizeof(picker_title)); strlcpy(picker_title, "Select core", sizeof(picker_title));
strlcpy(picker_filter, ".dll", sizeof(picker_filter)); strlcpy(picker_filter, ".dll", sizeof(picker_filter));
picker_startup_dir = settings->directory.libretro; picker_startup_dir = settings->paths.directory_libretro;
nk->window[NK_WND_FILE_PICKER].open = true; nk->window[NK_WND_FILE_PICKER].open = true;
} }
nk_layout_row_dynamic(ctx, 30, 1); nk_layout_row_dynamic(ctx, 30, 1);
@ -96,7 +96,7 @@ void nk_wnd_main(nk_menu_handle_t *nk, const char* title)
out = content; out = content;
strlcpy(picker_title, "Select content", sizeof(picker_title)); strlcpy(picker_title, "Select content", sizeof(picker_title));
strlcpy(picker_filter, ".zip", sizeof(picker_filter)); strlcpy(picker_filter, ".zip", sizeof(picker_filter));
picker_startup_dir = settings->directory.menu_content; picker_startup_dir = settings->paths.directory_menu_content;
nk->window[NK_WND_FILE_PICKER].open = true; nk->window[NK_WND_FILE_PICKER].open = true;
} }
} }