mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-04 21:40:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change font_size to float

Browse Source
This commit is contained in:
twinaphex 2013-01-11 23:00:51 +01:00
parent 81fecc88ea
commit f21c998cc7
3 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.def.h
View File

@ -225,7 +225,7 @@ static const bool crop_overscan = true;
#ifdef HAVE_RMENU #ifdef HAVE_RMENU
static const float font_size = 1.0f; static const float font_size = 1.0f;
#else #else
static const unsigned font_size = 48; static const float font_size = 48;
#endif #endif
// Attempt to scale the font size. // Attempt to scale the font size.
// The scale factor will be window_size / desktop_size. // The scale factor will be window_size / desktop_size.

4
general.h
View File

@ -168,11 +168,7 @@ struct settings
char shader_dir[PATH_MAX]; char shader_dir[PATH_MAX];
char font_path[PATH_MAX]; char font_path[PATH_MAX];
#ifdef HAVE_RMENU
float font_size; float font_size;
#else
unsigned font_size;
#endif
bool font_enable; bool font_enable;
bool font_scale; bool font_scale;
float msg_pos_x; float msg_pos_x;

8
settings.c
View File

@ -448,11 +448,7 @@ bool config_load_file(const char *path)
CONFIG_GET_BOOL(video.allow_rotate, "video_allow_rotate"); CONFIG_GET_BOOL(video.allow_rotate, "video_allow_rotate");
CONFIG_GET_PATH(video.font_path, "video_font_path"); CONFIG_GET_PATH(video.font_path, "video_font_path");
#ifdef HAVE_RMENU
CONFIG_GET_FLOAT(video.font_size, "video_font_size"); CONFIG_GET_FLOAT(video.font_size, "video_font_size");
#else
CONFIG_GET_INT(video.font_size, "video_font_size");
#endif
CONFIG_GET_BOOL(video.font_enable, "video_font_enable"); CONFIG_GET_BOOL(video.font_enable, "video_font_enable");
CONFIG_GET_BOOL(video.font_scale, "video_font_scale"); CONFIG_GET_BOOL(video.font_scale, "video_font_scale");
CONFIG_GET_FLOAT(video.msg_pos_x, "video_message_pos_x"); CONFIG_GET_FLOAT(video.msg_pos_x, "video_message_pos_x");
@ -1205,11 +1201,7 @@ bool config_save_file(const char *path)
config_set_int(conf, "zip_extract_mode", g_extern.file_state.zip_extract_mode); config_set_int(conf, "zip_extract_mode", g_extern.file_state.zip_extract_mode);
#endif #endif
#ifdef HAVE_RMENU
config_set_float(conf, "video_font_size", g_settings.video.font_size); config_set_float(conf, "video_font_size", g_settings.video.font_size);
#else
config_set_int(conf, "video_font_size", g_settings.video.font_size);
#endif
// g_extern // g_extern
config_set_int(conf, "sound_mode", g_extern.console.sound.mode); config_set_int(conf, "sound_mode", g_extern.console.sound.mode);