ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reimplement MENU_FILE_USE_DIRECTORY

This commit is contained in:
twinaphex 2014-10-12 03:14:03 +02:00
parent 82d1168622
commit 2dadf9fc10
2 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
frontend/menu/backend/menu_common_backend.c
View File

@ -755,7 +755,6 @@ static int menu_action_ok(const char *menu_path,
#if 0 #if 0
RARCH_LOG("menu label: %s\n", menu_label); RARCH_LOG("menu label: %s\n", menu_label);
RARCH_LOG("type : %d\n", type == MENU_FILE_USE_DIRECTORY);
RARCH_LOG("type id : %d\n", type); RARCH_LOG("type id : %d\n", type);
#endif #endif
while (true) while (true)
@ -889,17 +888,6 @@ static int menu_action_ok(const char *menu_path,
} }
return 0; return 0;
case MENU_FILE_USE_DIRECTORY:
if (setting && setting->type == ST_DIR)
{
menu_action_setting_set_current_string(setting, menu_path);
menu_entries_pop_stack(driver.menu->menu_stack, setting->name);
}
return 0;
case MENU_FILE_DIRECTORY: case MENU_FILE_DIRECTORY:
case MENU_FILE_CARCHIVE: case MENU_FILE_CARCHIVE:

29
frontend/menu/menu_entries_cbs.c
View File

@ -13,6 +13,7 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "menu_action.h"
#include "menu_common.h" #include "menu_common.h"
#include "menu_input_line_cb.h" #include "menu_input_line_cb.h"
#include "menu_entries.h" #include "menu_entries.h"
@ -137,6 +138,32 @@ static int action_ok_shader_preset_save_as(const char *path,
return 0; return 0;
} }
static int action_ok_path_use_directory(const char *path,
const char *label, unsigned type, size_t index)
{
const char *menu_label = NULL;
const char *menu_path = NULL;
rarch_setting_t *setting = NULL;
if (!driver.menu)
return -1;
file_list_get_last(driver.menu->menu_stack, &menu_path, &menu_label, NULL);
setting = (rarch_setting_t*)
setting_data_find_setting(driver.menu->list_settings, menu_label);
if (!setting)
return -1;
if (setting->type == ST_DIR)
{
menu_action_setting_set_current_string(setting, menu_path);
menu_entries_pop_stack(driver.menu->menu_stack, setting->name);
}
return 0;
}
/* Bind the OK callback function */ /* Bind the OK callback function */
static int menu_entries_cbs_init_bind_ok(menu_file_list_cbs_t *cbs, static int menu_entries_cbs_init_bind_ok(menu_file_list_cbs_t *cbs,
@ -148,6 +175,8 @@ static int menu_entries_cbs_init_bind_ok(menu_file_list_cbs_t *cbs,
cbs->action_ok = action_ok_shader_preset_load; cbs->action_ok = action_ok_shader_preset_load;
else if (type == MENU_FILE_SHADER) else if (type == MENU_FILE_SHADER)
cbs->action_ok = action_ok_shader_pass_load; cbs->action_ok = action_ok_shader_pass_load;
else if (type == MENU_FILE_USE_DIRECTORY)
cbs->action_ok = action_ok_path_use_directory;
else else
return -1; return -1;