mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-30 07:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

(XMB) Normalize the shadows setting name

Browse Source
This commit is contained in:
Jean-André Santoni 2016-04-22 12:46:56 +07:00
parent a1e91ff606
commit 989823691e
7 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.def.h
View File

@ -511,7 +511,7 @@ static bool default_block_config_read = true;
static unsigned xmb_scale_factor = 100;
static unsigned xmb_alpha_factor = 75;
static unsigned xmb_theme = 0;
static bool xmb_shadows = false;
static bool xmb_shadows_enable = false;
static bool xmb_ribbon_enable = false;
static bool show_advanced_settings = true;

6
configuration.c
View File

@ -483,7 +483,7 @@ static void config_set_defaults(void)
settings->menu.xmb_scale_factor = xmb_scale_factor;
settings->menu.xmb_alpha_factor = xmb_alpha_factor;
settings->menu.xmb_theme = xmb_theme;
settings->menu.xmb_shadows = xmb_shadows;
settings->menu.xmb_shadows_enable = xmb_shadows_enable;
settings->menu.xmb_ribbon_enable = xmb_ribbon_enable;
settings->menu.xmb_font[0] = '\0';
settings->menu.throttle_framerate = true;
@ -1542,7 +1542,7 @@ static bool config_load_file(const char *path, bool set_defaults)
CONFIG_GET_INT_BASE(conf, settings, menu.xmb_scale_factor, "xmb_scale_factor");
CONFIG_GET_INT_BASE(conf, settings, menu.xmb_alpha_factor, "xmb_alpha_factor");
CONFIG_GET_INT_BASE(conf, settings, menu.xmb_theme, "xmb_theme");
CONFIG_GET_BOOL_BASE(conf, settings, menu.xmb_shadows, "xmb_shadows");
CONFIG_GET_BOOL_BASE(conf, settings, menu.xmb_shadows_enable, "xmb_shadows_enable");
CONFIG_GET_BOOL_BASE(conf, settings, menu.xmb_ribbon_enable, "xmb_ribbon_enable");
config_get_path(conf, "xmb_font", settings->menu.xmb_font, sizeof(settings->menu.xmb_font));
#endif
@ -2775,7 +2775,7 @@ bool config_save_file(const char *path)
config_set_int(conf, "xmb_scale_factor", settings->menu.xmb_scale_factor);
config_set_int(conf, "xmb_alpha_factor", settings->menu.xmb_alpha_factor);
config_set_int(conf, "xmb_theme", settings->menu.xmb_theme);
config_set_bool(conf, "xmb_shadows", settings->menu.xmb_shadows);
config_set_bool(conf, "xmb_shadows_enable", settings->menu.xmb_shadows_enable);
config_set_bool(conf, "xmb_ribbon_enable", settings->menu.xmb_ribbon_enable);
config_set_path(conf, "xmb_font",
!string_is_empty(settings->menu.xmb_font) ? settings->menu.xmb_font : "");

2
configuration.h
View File

@ -167,7 +167,7 @@ typedef struct settings
unsigned xmb_scale_factor;
unsigned xmb_alpha_factor;
unsigned xmb_theme;
bool xmb_shadows;
bool xmb_shadows_enable;
bool xmb_ribbon_enable;
char xmb_font[PATH_MAX_LENGTH];
bool throttle_framerate;

4
menu/drivers/xmb.c
View File

@ -405,7 +405,7 @@ static void xmb_draw_icon(
draw.texture = texture;
draw.prim_type = MENU_DISPLAY_PRIM_TRIANGLESTRIP;
if (settings->menu.xmb_shadows)
if (settings->menu.xmb_shadows_enable)
{
for (i = 0; i < 16; i++)
shadow[i] = 0;
@ -496,7 +496,7 @@ static void xmb_draw_text(xmb_handle_t *xmb,
params.full_screen = true;
params.text_align = text_align;
if (settings->menu.xmb_shadows)
if (settings->menu.xmb_shadows_enable)
{
params.drop_x = 2.0f;
params.drop_y = -2.0f;

8
menu/intl/menu_hash_us.c
View File

@ -300,8 +300,8 @@ static const char *menu_hash_to_str_us_label(uint32_t hash)
return "xmb_font";
case MENU_LABEL_XMB_THEME:
return "xmb_theme";
case MENU_LABEL_XMB_SHADOWS:
return "xmb_shadows";
case MENU_LABEL_XMB_SHADOWS_ENABLE:
return "xmb_shadows_enable";
case MENU_LABEL_XMB_RIBBON_ENABLE:
return "xmb_ribbon_enable";
case MENU_LABEL_XMB_SCALE_FACTOR:
@ -1060,8 +1060,8 @@ const char *menu_hash_to_str_us(uint32_t hash)
return "XMB Font";
case MENU_LABEL_VALUE_XMB_THEME:
return "XMB Theme";
case MENU_LABEL_VALUE_XMB_SHADOWS:
return "XMB Shadows";
case MENU_LABEL_VALUE_XMB_SHADOWS_ENABLE:
return "XMB Shadows Enable";
case MENU_LABEL_VALUE_XMB_RIBBON_ENABLE:
return "XMB Ribbon Enable";
case MENU_LABEL_VALUE_SUSPEND_SCREENSAVER_ENABLE:

4
menu/menu_hash.h
View File

@ -388,8 +388,8 @@ extern "C" {
#define MENU_LABEL_VALUE_XMB_FONT 0x0020337E7
#define MENU_LABEL_XMB_THEME 0x824c5a7eU
#define MENU_LABEL_VALUE_XMB_THEME 0x3603f65fU
#define MENU_LABEL_XMB_SHADOWS 0xf9859e24U
#define MENU_LABEL_VALUE_XMB_SHADOWS 0x7993b645U
#define MENU_LABEL_XMB_SHADOWS_ENABLE 0xd0fcc82aU
#define MENU_LABEL_VALUE_XMB_SHADOWS_ENABLE 0x5982498cU
#define MENU_LABEL_XMB_RIBBON_ENABLE 0x8e89c3edU
#define MENU_LABEL_VALUE_XMB_RIBBON_ENABLE 0xd53e09c8U
#define MENU_LABEL_VOLUME_UP 0xa66e9681U

8
menu/menu_setting.c
View File

@ -5877,10 +5877,10 @@ static bool setting_append_list(
CONFIG_BOOL(
list, list_info,
&settings->menu.xmb_shadows,
menu_hash_to_str(MENU_LABEL_XMB_SHADOWS),
menu_hash_to_str(MENU_LABEL_VALUE_XMB_SHADOWS),
xmb_shadows,
&settings->menu.xmb_shadows_enable,
menu_hash_to_str(MENU_LABEL_XMB_SHADOWS_ENABLE),
menu_hash_to_str(MENU_LABEL_VALUE_XMB_SHADOWS_ENABLE),
xmb_shadows_enable,
menu_hash_to_str(MENU_VALUE_OFF),
menu_hash_to_str(MENU_VALUE_ON),
&group_info,