From 7af2d2f31c1cf5700236e01c6d8021a032ffdab1 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 4 Sep 2014 18:55:24 +0200
Subject: [PATCH] (Menu) Set label width of 5 for MENU_FILE_SWITCH

---
 frontend/menu/disp/rgui.c        |  3 +++
 frontend/menu/disp/rmenu.c       |  3 +++
 frontend/menu/disp/rmenu_xui.cpp |  3 +++
 frontend/menu/menu_entries.c     | 24 ++++++++++++------------
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/frontend/menu/disp/rgui.c b/frontend/menu/disp/rgui.c
index f8e745e9e4..3ae9045db3 100644
--- a/frontend/menu/disp/rgui.c
+++ b/frontend/menu/disp/rgui.c
@@ -424,7 +424,10 @@ static void rgui_render(void)
                   type - MENU_SETTINGS_CORE_OPTION_START),
                sizeof(type_str));
       else if (type == MENU_FILE_SWITCH)
+      {
          strlcpy(type_str, "...", sizeof(type_str));
+         w = 5;
+      }
       else if (driver.menu_ctx && driver.menu_ctx->backend &&
             driver.menu_ctx->backend->setting_set_label)
          driver.menu_ctx->backend->setting_set_label(type_str,
diff --git a/frontend/menu/disp/rmenu.c b/frontend/menu/disp/rmenu.c
index 10f2f2cc66..871e9ab289 100644
--- a/frontend/menu/disp/rmenu.c
+++ b/frontend/menu/disp/rmenu.c
@@ -291,7 +291,10 @@ static void rmenu_render(void)
                   type - MENU_SETTINGS_CORE_OPTION_START),
                sizeof(type_str));
       else if (type == MENU_FILE_SWITCH)
+      {
          strlcpy(type_str, "...", sizeof(type_str));
+         w = 5;
+      }
       else if (driver.menu_ctx && driver.menu_ctx->backend
             && driver.menu_ctx->backend->setting_set_label)
          driver.menu_ctx->backend->setting_set_label(type_str,
diff --git a/frontend/menu/disp/rmenu_xui.cpp b/frontend/menu/disp/rmenu_xui.cpp
index e95b4614a7..61190df7bc 100644
--- a/frontend/menu/disp/rmenu_xui.cpp
+++ b/frontend/menu/disp/rmenu_xui.cpp
@@ -491,7 +491,10 @@ static void rmenu_xui_render(void)
                   type - MENU_SETTINGS_CORE_OPTION_START),
                sizeof(type_str));
       else if (type == MENU_FILE_SWITCH)
+      {
          strlcpy(type_str, "...", sizeof(type_str));
+         w = 5;
+      }
       else if (driver.menu_ctx && driver.menu_ctx->backend
             && driver.menu_ctx->backend->setting_set_label)
          driver.menu_ctx->backend->setting_set_label(type_str,
diff --git a/frontend/menu/menu_entries.c b/frontend/menu/menu_entries.c
index f7cbf0ad11..06de3cd152 100644
--- a/frontend/menu/menu_entries.c
+++ b/frontend/menu/menu_entries.c
@@ -102,24 +102,24 @@ int menu_entries_push_list(menu_handle_t *menu,
    {
       setting_data = (rarch_setting_t *)setting_data_get_mainmenu(true);
       file_list_clear(list);
-      add_setting_entry(menu,list,"core_list", 0, setting_data);
-      add_setting_entry(menu,list,"history_list", 0, setting_data);
-      add_setting_entry(menu,list,"detect_core_list", 0, setting_data);
-      add_setting_entry(menu,list,"load_content", 0, setting_data);
+      add_setting_entry(menu,list,"core_list", MENU_FILE_SWITCH, setting_data);
+      add_setting_entry(menu,list,"history_list", MENU_FILE_SWITCH, setting_data);
+      add_setting_entry(menu,list,"detect_core_list", MENU_FILE_SWITCH, setting_data);
+      add_setting_entry(menu,list,"load_content", MENU_FILE_SWITCH, setting_data);
       add_setting_entry(menu,list,"core_options", MENU_FILE_SWITCH, setting_data);
-      add_setting_entry(menu,list,"core_information", 0, setting_data);
+      add_setting_entry(menu,list,"core_information", MENU_FILE_SWITCH, setting_data);
       add_setting_entry(menu,list,"settings", MENU_SETTINGS_OPTIONS, setting_data);
       add_setting_entry(menu,list,"performance_counters", MENU_FILE_SWITCH, setting_data);
       add_setting_entry(menu,list,"savestate", 0, setting_data);
       add_setting_entry(menu,list,"loadstate", 0, setting_data);
-      add_setting_entry(menu,list,"take_screenshot", 0, setting_data);
-      add_setting_entry(menu,list,"resume_content", 0, setting_data);
-      add_setting_entry(menu,list,"restart_content", 0, setting_data);
-      add_setting_entry(menu,list,"restart_retroarch", 0, setting_data);
+      add_setting_entry(menu,list,"take_screenshot", MENU_FILE_SWITCH, setting_data);
+      add_setting_entry(menu,list,"resume_content", MENU_FILE_SWITCH, setting_data);
+      add_setting_entry(menu,list,"restart_content", MENU_FILE_SWITCH, setting_data);
+      add_setting_entry(menu,list,"restart_retroarch", MENU_FILE_SWITCH, setting_data);
       add_setting_entry(menu,list,"configurations", MENU_SETTINGS_CONFIG, setting_data);
-      add_setting_entry(menu,list,"save_new_config", 0, setting_data);
-      add_setting_entry(menu,list,"help", 0, setting_data);
-      add_setting_entry(menu,list,"quit_retroarch", 0, setting_data);
+      add_setting_entry(menu,list,"save_new_config", MENU_FILE_SWITCH, setting_data);
+      add_setting_entry(menu,list,"help", MENU_FILE_SWITCH, setting_data);
+      add_setting_entry(menu,list,"quit_retroarch", MENU_FILE_SWITCH, setting_data);
    }
    else if (!strcmp(path, "General Options"))
    {