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

Start using menu_popup_push_pending

This commit is contained in:
twinaphex 2016-09-04 23:23:54 +02:00
parent 580e27d2e4
commit 575e7b36ab
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
menu/cbs/menu_cbs_ok.c
View File

@ -27,6 +27,7 @@
#include "../menu_setting.h" #include "../menu_setting.h"
#include "../menu_shader.h" #include "../menu_shader.h"
#include "../menu_navigation.h" #include "../menu_navigation.h"
#include "../menu_popup.h"
#include "../menu_content.h" #include "../menu_content.h"
#include "../../configuration.h" #include "../../configuration.h"
@ -240,8 +241,7 @@ int generic_action_ok_displaylist_push(const char *path,
break; break;
case ACTION_OK_DL_HELP: case ACTION_OK_DL_HELP:
info_label = label; info_label = label;
menu->help_screen.type = type; menu_popup_push_pending(menu, true, type);
menu->help_screen.push = true;
dl_type = DISPLAYLIST_HELP; dl_type = DISPLAYLIST_HELP;
break; break;
case ACTION_OK_DL_RPL_ENTRY: case ACTION_OK_DL_RPL_ENTRY:

7
menu/menu_driver.c
View File

@ -24,6 +24,7 @@
#include "menu_cbs.h" #include "menu_cbs.h"
#include "menu_display.h" #include "menu_display.h"
#include "menu_navigation.h" #include "menu_navigation.h"
#include "menu_popup.h"
#include "menu_shader.h" #include "menu_shader.h"
#include "../config.def.h" #include "../config.def.h"
@ -171,8 +172,7 @@ static bool menu_init(menu_handle_t *menu_data)
if (settings->menu_show_start_screen) if (settings->menu_show_start_screen)
{ {
menu_data->help_screen.push = true; menu_popup_push_pending(menu_data, true, MENU_HELP_WELCOME);
menu_data->help_screen.type = MENU_HELP_WELCOME;
settings->menu_show_start_screen = false; settings->menu_show_start_screen = false;
command_event(CMD_EVENT_MENU_SAVE_CURRENT_CONFIG, NULL); command_event(CMD_EVENT_MENU_SAVE_CURRENT_CONFIG, NULL);
} }
@ -188,8 +188,7 @@ static bool menu_init(menu_handle_t *menu_data)
#endif #endif
) )
{ {
menu_data->help_screen.type = MENU_HELP_EXTRACT; menu_popup_push_pending(menu_data, true, MENU_HELP_EXTRACT);
menu_data->help_screen.push = true;
#ifdef HAVE_ZLIB #ifdef HAVE_ZLIB
task_push_decompress(settings->path.bundle_assets_src, task_push_decompress(settings->path.bundle_assets_src,
settings->path.bundle_assets_dst, settings->path.bundle_assets_dst,

5
menu/menu_popup.h
View File

@ -20,10 +20,15 @@
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include <boolean.h>
#include <retro_common_api.h> #include <retro_common_api.h>
RETRO_BEGIN_DECLS RETRO_BEGIN_DECLS
void menu_popup_push_pending(menu_handle_t *menu,
bool push, enum menu_help_type type);
int menu_popup_iterate_help(menu_handle_t *menu, int menu_popup_iterate_help(menu_handle_t *menu,
char *s, size_t len, const char *label); char *s, size_t len, const char *label);