Skip to content

Commit 10a9e48

Browse files
sonninnossonninnos
authored
XMB: Make horizontal menu optional (#19013)
* XMB: Make horizontal menu optional * Add location option for Netplay item
1 parent a1b4249 commit 10a9e48

12 files changed

Lines changed: 108 additions & 48 deletions

‎config.def.h‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -833,16 +833,18 @@
833833
#if defined(HAVE_FFMPEG) || defined(HAVE_MPV)
834834
#define DEFAULT_CONTENT_SHOW_VIDEO true
835835
#endif
836+
837+
#define DEFAULT_MENU_CONTENT_SHOW_ADD_ENTRY MENU_ADD_CONTENT_ENTRY_DISPLAY_PLAYLISTS_TAB
838+
839+
/* Share 'Import Content' values */
836840
#if defined(HAVE_NETWORKING)
837841
#if defined(_3DS)
838-
#define DEFAULT_CONTENT_SHOW_NETPLAY false
842+
#define DEFAULT_CONTENT_SHOW_NETPLAY MENU_ADD_CONTENT_ENTRY_DISPLAY_HIDDEN
839843
#else
840-
#define DEFAULT_CONTENT_SHOW_NETPLAY true
844+
#define DEFAULT_CONTENT_SHOW_NETPLAY MENU_ADD_CONTENT_ENTRY_DISPLAY_PLAYLISTS_TAB
841845
#endif
842846
#endif
843847

844-
#define DEFAULT_MENU_CONTENT_SHOW_ADD_ENTRY MENU_ADD_CONTENT_ENTRY_DISPLAY_PLAYLISTS_TAB
845-
846848
#define DEFAULT_CONTENT_SHOW_PLAYLISTS true
847849
#define DEFAULT_CONTENT_SHOW_PLAYLIST_TABS true
848850

@@ -854,6 +856,7 @@
854856
#ifdef HAVE_XMB
855857
#define DEFAULT_XMB_ANIMATION 0
856858
#define DEFAULT_XMB_VERTICAL_FADE_FACTOR 100
859+
#define DEFAULT_XMB_SHOW_HORIZONTAL_LIST true
857860
#define DEFAULT_XMB_SHOW_TITLE_HEADER true
858861
#define DEFAULT_XMB_SWITCH_ICONS true
859862
#define DEFAULT_XMB_CURRENT_MENU_ICON 1

‎configuration.c‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2093,9 +2093,6 @@ static struct config_bool_setting *populate_settings_bool(
20932093
SETTING_BOOL("content_show_music", &settings->bools.menu_content_show_music, true, DEFAULT_CONTENT_SHOW_MUSIC, false);
20942094
#if defined(HAVE_FFMPEG) || defined(HAVE_MPV)
20952095
SETTING_BOOL("content_show_video", &settings->bools.menu_content_show_video, true, DEFAULT_CONTENT_SHOW_VIDEO, false);
2096-
#endif
2097-
#ifdef HAVE_NETWORKING
2098-
SETTING_BOOL("content_show_netplay", &settings->bools.menu_content_show_netplay, true, DEFAULT_CONTENT_SHOW_NETPLAY, false);
20992096
#endif
21002097
SETTING_BOOL("content_show_history", &settings->bools.menu_content_show_history, true, DEFAULT_CONTENT_SHOW_HISTORY, false);
21012098
SETTING_BOOL("content_show_playlists", &settings->bools.menu_content_show_playlists, true, DEFAULT_CONTENT_SHOW_PLAYLISTS, false);
@@ -2163,6 +2160,7 @@ static struct config_bool_setting *populate_settings_bool(
21632160
SETTING_BOOL("xmb_shadows_enable", &settings->bools.menu_xmb_shadows_enable, true, DEFAULT_XMB_SHADOWS_ENABLE, false);
21642161
SETTING_BOOL("xmb_switch_icons", &settings->bools.menu_xmb_switch_icons, true, DEFAULT_XMB_SWITCH_ICONS, false);
21652162
SETTING_BOOL("xmb_vertical_thumbnails", &settings->bools.menu_xmb_vertical_thumbnails, true, DEFAULT_XMB_VERTICAL_THUMBNAILS, false);
2163+
SETTING_BOOL("menu_xmb_show_horizontal_list", &settings->bools.menu_xmb_show_horizontal_list, true, DEFAULT_XMB_SHOW_HORIZONTAL_LIST, false);
21662164
SETTING_BOOL("menu_xmb_show_title_header", &settings->bools.menu_xmb_show_title_header, true, DEFAULT_XMB_SHOW_TITLE_HEADER, false);
21672165
#endif
21682166
#ifdef HAVE_OZONE
@@ -2471,6 +2469,9 @@ static struct config_uint_setting *populate_settings_uint(
24712469
#ifdef HAVE_MENU
24722470
SETTING_UINT("content_show_add_entry", &settings->uints.menu_content_show_add_entry, true, DEFAULT_MENU_CONTENT_SHOW_ADD_ENTRY, false);
24732471
SETTING_UINT("content_show_contentless_cores",&settings->uints.menu_content_show_contentless_cores, true, DEFAULT_MENU_CONTENT_SHOW_CONTENTLESS_CORES, false);
2472+
#ifdef HAVE_NETWORKING
2473+
SETTING_UINT("content_show_netplay", &settings->uints.menu_content_show_netplay, true, DEFAULT_CONTENT_SHOW_NETPLAY, false);
2474+
#endif
24742475
SETTING_UINT("content_history_size", &settings->uints.content_history_size, true, DEFAULT_CONTENT_HISTORY_SIZE, false);
24752476
SETTING_UINT("playlist_entry_remove_enable", &settings->uints.playlist_entry_remove_enable, true, DEFAULT_PLAYLIST_ENTRY_REMOVE_ENABLE, false);
24762477
SETTING_UINT("playlist_show_inline_core_name", &settings->uints.playlist_show_inline_core_name, true, DEFAULT_PLAYLIST_SHOW_INLINE_CORE_NAME, false);

‎configuration.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,7 @@ typedef struct settings
332332
unsigned menu_scroll_delay;
333333
unsigned menu_content_show_add_entry;
334334
unsigned menu_content_show_contentless_cores;
335+
unsigned menu_content_show_netplay;
335336
unsigned menu_screensaver_timeout;
336337
unsigned menu_screensaver_animation;
337338
unsigned menu_remember_selection;
@@ -879,6 +880,7 @@ typedef struct settings
879880
bool menu_rgui_switch_icons;
880881
bool menu_rgui_particle_effect_screensaver;
881882
bool menu_xmb_shadows_enable;
883+
bool menu_xmb_show_horizontal_list;
882884
bool menu_xmb_show_title_header;
883885
bool menu_xmb_switch_icons;
884886
bool menu_xmb_vertical_thumbnails;
@@ -888,7 +890,6 @@ typedef struct settings
888890
bool menu_content_show_images;
889891
bool menu_content_show_music;
890892
bool menu_content_show_video;
891-
bool menu_content_show_netplay;
892893
bool menu_content_show_history;
893894
bool menu_content_show_playlists;
894895
bool menu_content_show_playlist_tabs;

‎intl/msg_hash_us.h‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6502,7 +6502,7 @@ MSG_HASH(
65026502
)
65036503
MSG_HASH(
65046504
MENU_ENUM_SUBLABEL_CONTENT_SHOW_NETPLAY,
6505-
"Show the 'Netplay' menu."
6505+
"Show the 'Netplay' entry inside the Main Menu or Playlists."
65066506
)
65076507
MSG_HASH(
65086508
MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_HISTORY,
@@ -12280,6 +12280,10 @@ MSG_HASH(
1228012280
MENU_ENUM_LABEL_VALUE_MENU_XMB_VERTICAL_FADE_FACTOR,
1228112281
"Vertical Fade Factor"
1228212282
)
12283+
MSG_HASH(
12284+
MENU_ENUM_LABEL_VALUE_MENU_XMB_SHOW_HORIZONTAL_LIST,
12285+
"Show Horizontal List"
12286+
)
1228312287
MSG_HASH(
1228412288
MENU_ENUM_LABEL_VALUE_MENU_XMB_SHOW_TITLE_HEADER,
1228512289
"Show Title Header"

‎menu/cbs/menu_cbs_left.c‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -248,16 +248,19 @@ static int action_left_mainmenu(unsigned type, const char *label,
248248
bool wraparound)
249249
{
250250
#ifdef HAVE_XMB
251-
struct menu_state *menu_st = menu_state_get_ptr();
251+
settings_t *settings = config_get_ptr();
252+
struct menu_state *menu_st = menu_state_get_ptr();
252253
const menu_ctx_driver_t *driver_ctx = menu_st->driver_ctx;
253-
size_t _len = (driver_ctx && driver_ctx->list_get_size) ? driver_ctx->list_get_size(menu_st->userdata, MENU_LIST_PLAIN) : 0;
254254
const char *menu_ident = (driver_ctx && driver_ctx->ident) ? driver_ctx->ident : NULL;
255+
size_t _len = (driver_ctx && driver_ctx->list_get_size)
256+
? driver_ctx->list_get_size(menu_st->userdata, MENU_LIST_PLAIN)
257+
: 0;
255258
/* Tab switching functionality only applies
256259
* to XMB */
257260
if ( (_len == 1)
261+
&& settings->bools.menu_xmb_show_horizontal_list
258262
&& string_is_equal(menu_ident, "xmb"))
259263
{
260-
settings_t *settings = config_get_ptr();
261264
bool menu_nav_wraparound_enable = settings->bools.menu_navigation_wraparound_enable;
262265
size_t selection = (driver_ctx && driver_ctx->list_get_selection) ? driver_ctx->list_get_selection(menu_st->userdata) : 0;
263266
if ((selection != 0) || menu_nav_wraparound_enable)

‎menu/cbs/menu_cbs_right.c‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -269,21 +269,20 @@ static int action_right_mainmenu(unsigned type, const char *label,
269269
bool wraparound)
270270
{
271271
#ifdef HAVE_XMB
272-
struct menu_state *menu_st = menu_state_get_ptr();
272+
settings_t *settings = config_get_ptr();
273+
struct menu_state *menu_st = menu_state_get_ptr();
273274
const menu_ctx_driver_t *driver_ctx = menu_st->driver_ctx;
274-
const char *menu_ident = (driver_ctx && driver_ctx->ident)
275-
? driver_ctx->ident
276-
: NULL;
275+
const char *menu_ident = (driver_ctx && driver_ctx->ident) ? driver_ctx->ident : NULL;
277276
size_t _len = (driver_ctx && driver_ctx->list_get_size)
278-
? driver_ctx->list_get_size(menu_st->userdata, MENU_LIST_PLAIN)
279-
: 0;
277+
? driver_ctx->list_get_size(menu_st->userdata, MENU_LIST_PLAIN)
278+
: 0;
280279
/* Tab switching functionality only applies
281280
* to XMB */
282281
if ( (_len == 1)
282+
&& settings->bools.menu_xmb_show_horizontal_list
283283
&& string_is_equal(menu_ident, "xmb"))
284284
{
285285
size_t horiz_size = 0, tabs_size = 0, selection = 0;
286-
settings_t *settings = config_get_ptr();
287286
bool menu_nav_wraparound_enable = settings->bools.menu_navigation_wraparound_enable;
288287
if (driver_ctx)
289288
{

‎menu/drivers/ozone.c‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5336,6 +5336,11 @@ static void ozone_refresh_system_tabs_list(ozone_handle_t * ozone)
53365336
ozone->tabs[++ozone->system_tab_end] = OZONE_SYSTEM_TAB_VIDEO;
53375337
#endif
53385338

5339+
#ifdef HAVE_NETWORKING
5340+
if (settings->uints.menu_content_show_netplay == MENU_ADD_CONTENT_ENTRY_DISPLAY_PLAYLISTS_TAB)
5341+
ozone->tabs[++ozone->system_tab_end] = OZONE_SYSTEM_TAB_NETPLAY;
5342+
#endif
5343+
53395344
if ( settings->uints.menu_content_show_add_entry == MENU_ADD_CONTENT_ENTRY_DISPLAY_PLAYLISTS_TAB
53405345
&& !settings->bools.kiosk_mode_enable)
53415346
ozone->tabs[++ozone->system_tab_end] = OZONE_SYSTEM_TAB_ADD;

‎menu/drivers/xmb.c‎

Lines changed: 29 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ enum
128128
#endif
129129
#ifdef HAVE_NETWORKING
130130
XMB_TEXTURE_NETPLAY,
131-
XMB_TEXTURE_NETPLAY_ALT,
132131
XMB_TEXTURE_ROOM,
133132
XMB_TEXTURE_ROOM_LAN,
134133
XMB_TEXTURE_ROOM_RELAY,
@@ -481,6 +480,7 @@ typedef struct xmb_handle
481480
bool show_mouse;
482481
bool show_screensaver;
483482
bool show_playlist_tabs;
483+
bool show_horizontal_list;
484484
bool use_ps3_layout;
485485
bool last_use_ps3_layout;
486486
bool assets_missing;
@@ -568,6 +568,8 @@ static INLINE float xmb_item_y(const xmb_handle_t *xmb,
568568

569569
if (i < (int)current)
570570
{
571+
if (!xmb->show_horizontal_list)
572+
return icon_spacing_vertical * (i - (int)current + xmb->above_subitem_offset);
571573
if (xmb->depth > 1)
572574
return icon_spacing_vertical * (i - (int)current + xmb->above_subitem_offset);
573575
return icon_spacing_vertical * (i - (int)current + xmb->above_item_offset);
@@ -3235,6 +3237,11 @@ static void xmb_refresh_system_tabs_list(xmb_handle_t *xmb)
32353237
xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_VIDEO;
32363238
#endif
32373239

3240+
#ifdef HAVE_NETWORKING
3241+
if (settings->uints.menu_content_show_netplay == MENU_ADD_CONTENT_ENTRY_DISPLAY_PLAYLISTS_TAB)
3242+
xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_NETPLAY;
3243+
#endif
3244+
32383245
if ( settings->uints.menu_content_show_add_entry == MENU_ADD_CONTENT_ENTRY_DISPLAY_PLAYLISTS_TAB
32393246
&& !settings->bools.kiosk_mode_enable)
32403247
xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_ADD;
@@ -3365,6 +3372,7 @@ static void xmb_populate_entries(void *data,
33653372
return;
33663373

33673374
xmb->show_playlist_tabs = settings->bools.menu_content_show_playlist_tabs;
3375+
xmb->show_horizontal_list = settings->bools.menu_xmb_show_horizontal_list;
33683376

33693377
xmb->skip_thumbnail_reset = false;
33703378
if (xmb->is_quick_menu && depth < xmb->old_depth)
@@ -3677,6 +3685,7 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb,
36773685
case MENU_ENUM_LABEL_MAIN_MENU:
36783686
return xmb->textures.list[XMB_TEXTURE_MAIN_MENU];
36793687
case MENU_ENUM_LABEL_SETTINGS_TAB:
3688+
case MENU_ENUM_LABEL_SETTINGS:
36803689
return xmb->textures.list[XMB_TEXTURE_SETTINGS];
36813690
case MENU_ENUM_LABEL_QUICK_MENU_SHOW_OPTIONS:
36823691
return xmb->textures.list[XMB_TEXTURE_CORE_OPTIONS];
@@ -6268,6 +6277,22 @@ static enum menu_action xmb_parse_menu_entry_action(
62686277
menu_st->selection_ptr = 0;
62696278
xmb_selection_pointer_changed(xmb, true);
62706279
}
6280+
else if (!config_get_ptr()->bools.menu_xmb_show_horizontal_list)
6281+
{
6282+
/* Reset horizontal list to Main Menu */
6283+
file_list_t *menu_stack = MENU_LIST_GET(menu_list, 0);
6284+
file_list_t *selection_buf = menu_list ? MENU_LIST_GET_SELECTION(menu_list, 0) : NULL;
6285+
size_t stack_size = menu_stack->size;
6286+
6287+
if (menu_stack->list[stack_size - 1].label)
6288+
free(menu_stack->list[stack_size - 1].label);
6289+
menu_stack->list[stack_size - 1].label = NULL;
6290+
6291+
menu_stack->list[stack_size - 1].label = strdup(msg_hash_to_str(MENU_ENUM_LABEL_MAIN_MENU));
6292+
menu_stack->list[stack_size - 1].type = MENU_SETTINGS;
6293+
6294+
menu_driver_deferred_push_content_list(selection_buf);
6295+
}
62716296
else if (config_get_ptr()->bools.input_menu_allow_tabs_back)
62726297
{
62736298
/* Jump to Main Menu */
@@ -6639,8 +6664,6 @@ static const char *xmb_texture_path(unsigned id)
66396664
#ifdef HAVE_NETWORKING
66406665
case XMB_TEXTURE_NETPLAY:
66416666
return "netplay.png";
6642-
case XMB_TEXTURE_NETPLAY_ALT:
6643-
return "../../../ozone/png/sidebar/netplay.png";
66446667
case XMB_TEXTURE_ROOM:
66456668
return "menu_room.png";
66466669
case XMB_TEXTURE_ROOM_LAN:
@@ -6798,19 +6821,6 @@ static void xmb_context_reset_textures(
67986821
char texpath[PATH_MAX_LENGTH];
67996822
const char *texture_path = xmb_texture_path(i);
68006823

6801-
#ifdef HAVE_NETWORKING
6802-
if ( (i == XMB_TEXTURE_NETPLAY)
6803-
&& (menu_xmb_theme == XMB_ICON_THEME_MONOCHROME))
6804-
{
6805-
char alt_path[PATH_MAX_LENGTH];
6806-
fill_pathname_join_special(alt_path,
6807-
iconpath, xmb_texture_path(XMB_TEXTURE_NETPLAY_ALT),
6808-
sizeof(alt_path));
6809-
if (path_is_valid(alt_path))
6810-
texture_path = xmb_texture_path(XMB_TEXTURE_NETPLAY_ALT);
6811-
}
6812-
#endif
6813-
68146824
fill_pathname_join_special(texpath,
68156825
iconpath, texture_path, sizeof(texpath));
68166826
gfx_display_reset_icon_texture(texpath,
@@ -7124,7 +7134,7 @@ static void xmb_render(void *data,
71247134
{
71257135
/* Only allow horizontal category switching at the top level (depth == 1)
71267136
* When in submenus (depth > 1), horizontal drag is disabled */
7127-
if (xmb->depth == 1)
7137+
if (xmb->depth == 1 && xmb->show_horizontal_list)
71287138
{
71297139
/* Apply horizontal drag to categories */
71307140
size_t list_size = xmb_list_get_size(xmb, MENU_LIST_HORIZONTAL) + xmb->system_tab_end + 1;
@@ -8597,7 +8607,7 @@ static void xmb_frame(void *data, video_frame_info_t *video_info)
85978607
dispctx->blend_begin(userdata);
85988608

85998609
/* Horizontal tab icons */
8600-
if (!xmb->assets_missing)
8610+
if (!xmb->assets_missing && xmb->show_horizontal_list)
86018611
{
86028612
unsigned horizontal_list_size = (xmb->show_playlist_tabs)
86038613
? (unsigned)xmb_list_get_size(xmb, MENU_LIST_HORIZONTAL)
@@ -10172,7 +10182,7 @@ static int xmb_pointer_up(void *userdata,
1017210182
if (xmb->drag_mode == XMB_DRAG_HORIZONTAL || xmb->drag_mode == XMB_DRAG_VERTICAL)
1017310183
{
1017410184
/* Snap horizontal scrolling to final category position */
10175-
if (xmb->drag_mode == XMB_DRAG_HORIZONTAL)
10185+
if (xmb->drag_mode == XMB_DRAG_HORIZONTAL && xmb->show_horizontal_list)
1017610186
{
1017710187
settings_t *settings = config_get_ptr();
1017810188
bool horizontal_animation = settings->bools.menu_horizontal_animation;

‎menu/menu_displaylist.c‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4199,7 +4199,8 @@ static bool menu_history_in_main_menu(const char *menu_ident,
41994199
{
42004200
return (!strcmp(menu_ident, "rgui"))
42014201
|| (!strcmp(menu_ident, "glui") && !settings->bools.menu_materialui_show_nav_bar)
4202-
|| (!strcmp(menu_ident, "ozone") && !settings->bools.ozone_show_sidebar);
4202+
|| (!strcmp(menu_ident, "ozone") && !settings->bools.ozone_show_sidebar)
4203+
|| (!strcmp(menu_ident, "xmb") && !settings->bools.menu_xmb_show_horizontal_list);
42034204
}
42044205

42054206
static unsigned menu_displaylist_parse_playlists(
@@ -4233,6 +4234,8 @@ static unsigned menu_displaylist_parse_playlists(
42334234
const char *menu_ident = menu_driver_ident();
42344235
bool show_add_content = (settings->uints.menu_content_show_add_entry ==
42354236
MENU_ADD_CONTENT_ENTRY_DISPLAY_PLAYLISTS_TAB);
4237+
bool show_netplay = (settings->uints.menu_content_show_netplay ==
4238+
MENU_ADD_CONTENT_ENTRY_DISPLAY_PLAYLISTS_TAB);
42364239
bool show_history = !menu_history_in_main_menu(menu_ident, settings);
42374240

42384241
if (show_history)
@@ -4303,6 +4306,14 @@ static unsigned menu_displaylist_parse_playlists(
43034306
count++;
43044307
#endif
43054308

4309+
if (show_netplay)
4310+
if (menu_entries_append(info_list,
4311+
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY),
4312+
MENU_ENUM_LABEL_NETPLAY_STR,
4313+
MENU_ENUM_LABEL_NETPLAY,
4314+
MENU_SETTING_ACTION, 0, 0, NULL))
4315+
count++;
4316+
43064317
if (show_add_content)
43074318
if (menu_entries_append(info_list,
43084319
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ADD_CONTENT_LIST),
@@ -10477,7 +10488,6 @@ unsigned menu_displaylist_build_list(
1047710488
#ifdef HAVE_LAKKA
1047810489
{MENU_ENUM_LABEL_MENU_SHOW_EJECT_DISC, PARSE_ONLY_BOOL, true },
1047910490
#endif
10480-
{MENU_ENUM_LABEL_CONTENT_SHOW_ADD_ENTRY, PARSE_ONLY_UINT, true },
1048110491
{MENU_ENUM_LABEL_CONTENT_SHOW_PLAYLISTS, PARSE_ONLY_BOOL, true },
1048210492
{MENU_ENUM_LABEL_CONTENT_SHOW_PLAYLIST_TABS, PARSE_ONLY_BOOL, true },
1048310493
{MENU_ENUM_LABEL_CONTENT_SHOW_HISTORY, PARSE_ONLY_BOOL, true },
@@ -10486,13 +10496,14 @@ unsigned menu_displaylist_build_list(
1048610496
{MENU_ENUM_LABEL_CONTENT_SHOW_IMAGES, PARSE_ONLY_BOOL, true },
1048710497
{MENU_ENUM_LABEL_CONTENT_SHOW_MUSIC, PARSE_ONLY_BOOL, true },
1048810498
{MENU_ENUM_LABEL_CONTENT_SHOW_VIDEO, PARSE_ONLY_BOOL, true },
10499+
{MENU_ENUM_LABEL_CONTENT_SHOW_NETPLAY, PARSE_ONLY_UINT, true },
10500+
{MENU_ENUM_LABEL_CONTENT_SHOW_ADD_ENTRY, PARSE_ONLY_UINT, true },
1048910501
#if defined(HAVE_DYNAMIC)
1049010502
{MENU_ENUM_LABEL_CONTENT_SHOW_CONTENTLESS_CORES, PARSE_ONLY_UINT, true },
1049110503
#endif
1049210504
{MENU_ENUM_LABEL_CONTENT_SHOW_EXPLORE, PARSE_ONLY_BOOL, true },
1049310505
{MENU_ENUM_LABEL_CONTENT_SHOW_SETTINGS, PARSE_ONLY_BOOL, true },
1049410506
{MENU_ENUM_LABEL_CONTENT_SHOW_SETTINGS_PASSWORD, PARSE_ONLY_STRING, true},
10495-
{MENU_ENUM_LABEL_CONTENT_SHOW_NETPLAY, PARSE_ONLY_BOOL, true },
1049610507
#ifdef HAVE_ONLINE_UPDATER
1049710508
{MENU_ENUM_LABEL_MENU_SHOW_ONLINE_UPDATER, PARSE_ONLY_BOOL, true },
1049810509
{MENU_ENUM_LABEL_MENU_SHOW_CORE_UPDATER, PARSE_ONLY_BOOL, true },
@@ -12097,6 +12108,7 @@ unsigned menu_displaylist_build_list(
1209712108
{MENU_ENUM_LABEL_MENU_FONT_COLOR_RED, PARSE_ONLY_UINT, true},
1209812109
{MENU_ENUM_LABEL_MENU_FONT_COLOR_GREEN, PARSE_ONLY_UINT, true},
1209912110
{MENU_ENUM_LABEL_MENU_FONT_COLOR_BLUE, PARSE_ONLY_UINT, true},
12111+
{MENU_ENUM_LABEL_MENU_XMB_SHOW_HORIZONTAL_LIST, PARSE_ONLY_BOOL, true},
1210012112
{MENU_ENUM_LABEL_MENU_XMB_SHOW_TITLE_HEADER, PARSE_ONLY_BOOL, true},
1210112113
{MENU_ENUM_LABEL_MENU_XMB_TITLE_MARGIN, PARSE_ONLY_INT, true},
1210212114
{MENU_ENUM_LABEL_MENU_XMB_TITLE_MARGIN_HORIZONTAL_OFFSET, PARSE_ONLY_INT, true},
@@ -15411,6 +15423,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
1541115423
const char *menu_ident = menu_driver_ident();
1541215424
uint32_t flags = runloop_get_flags();
1541315425
bool show_playlists = settings->bools.menu_content_show_playlists;
15426+
bool show_netplay = (settings->uints.menu_content_show_netplay ==
15427+
MENU_ADD_CONTENT_ENTRY_DISPLAY_MAIN_TAB);
1541415428
bool show_add_content = (settings->uints.menu_content_show_add_entry ==
1541515429
MENU_ADD_CONTENT_ENTRY_DISPLAY_MAIN_TAB)
1541615430
&& !settings->bools.kiosk_mode_enable;
@@ -15577,7 +15591,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
1557715591
count++;
1557815592

1557915593
#ifdef HAVE_NETWORKING
15580-
if (settings->bools.menu_content_show_netplay)
15594+
if (show_netplay)
1558115595
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(info->list,
1558215596
MENU_ENUM_LABEL_NETPLAY,
1558315597
PARSE_ACTION, false) == 0)

0 commit comments

Comments
 (0)