diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 4efc51d34c..5e7adb4487 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -2925,6 +2925,8 @@ MSG_HASH(MENU_ENUM_SUBLABEL_XMB_RIBBON_ENABLE, "Select an animated background effect. Can be GPU-intensive depending on the effect. If performance is unsatisfactory, either turn this off or revert to a simpler effect.") MSG_HASH(MENU_ENUM_SUBLABEL_XMB_FONT, "Select a different main font to be used by the menu.") +MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_FAVORITES, + "Show the favorites tab inside the main menu.") MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_IMAGES, "Show the image tab inside the main menu.") MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_MUSIC, diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index 94de7b9113..dce5fdd763 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -281,6 +281,7 @@ default_sublabel_macro(action_bind_sublabel_menu_color_theme, default_sublabel_macro(action_bind_sublabel_menu_wallpaper_opacity, MENU_ENUM_SUBLABEL_MENU_WALLPAPER_OPACITY) default_sublabel_macro(action_bind_sublabel_menu_ribbon_enable, MENU_ENUM_SUBLABEL_XMB_RIBBON_ENABLE) default_sublabel_macro(action_bind_sublabel_menu_font, MENU_ENUM_SUBLABEL_XMB_FONT) +default_sublabel_macro(action_bind_sublabel_menu_favorites_tab, MENU_ENUM_SUBLABEL_XMB_SHOW_FAVORITES) default_sublabel_macro(action_bind_sublabel_menu_images_tab, MENU_ENUM_SUBLABEL_XMB_SHOW_IMAGES) default_sublabel_macro(action_bind_sublabel_menu_show_online_updater, MENU_ENUM_SUBLABEL_MENU_SHOW_ONLINE_UPDATER) default_sublabel_macro(action_bind_sublabel_menu_show_core_updater, MENU_ENUM_SUBLABEL_MENU_SHOW_CORE_UPDATER) @@ -543,6 +544,9 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_XMB_SHOW_SETTINGS: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_settings_tab); break; + case MENU_ENUM_LABEL_XMB_SHOW_FAVORITES: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_favorites_tab); + break; case MENU_ENUM_LABEL_XMB_SHOW_IMAGES: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_images_tab); break; @@ -960,7 +964,7 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, break; case MENU_ENUM_LABEL_INPUT_OVERLAY_SHOW_PHYSICAL_INPUTS_PORT: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_overlay_show_physical_inputs_port); - break; + break; case MENU_ENUM_LABEL_VIDEO_FONT_SIZE: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_video_font_size); break; diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index dc1321f05f..d9bfca7dae 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -3297,7 +3297,7 @@ static void *xmb_init(void **userdata, bool video_is_threaded) xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_SETTINGS; if (settings->bools.menu_xmb_show_history) xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_HISTORY; - /* TODO if (settings->bools.menu_xmb_show_favorites)*/ + if (settings->bools.menu_xmb_show_favorites) xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_FAVORITES; #ifdef HAVE_IMAGEVIEWER if (settings->bools.menu_xmb_show_images) @@ -3740,7 +3740,7 @@ static void xmb_list_clear(file_list_t *list) size_t i; size_t size = list->size; menu_animation_ctx_tag tag = (uintptr_t)list; - + menu_animation_ctl(MENU_ANIMATION_CTL_KILL_BY_TAG, &tag); for (i = 0; i < size; ++i)