From e7d3e524bb9b8a9a3caab3f2e1d196fdb2703bcd Mon Sep 17 00:00:00 2001 From: TwinAphex51224 Date: Tue, 31 Jan 2012 18:51:45 +0100 Subject: [PATCH] (PS3) Added menu font options/settings --- general.h | 1 + ps3/main.c | 3 +++ ps3/menu-port-defines.h | 2 +- ps3/menu.c | 23 +++++++++++++++++++++++ 4 files changed, 28 insertions(+), 1 deletion(-) diff --git a/general.h b/general.h index 13dda7a4a6..3ef4870838 100644 --- a/general.h +++ b/general.h @@ -190,6 +190,7 @@ struct console_settings char default_rom_startup_dir[PATH_MAX]; char default_savestate_dir[PATH_MAX]; char default_sram_dir[PATH_MAX]; + float menu_font_size; }; #endif diff --git a/ps3/main.c b/ps3/main.c index 755d0f1081..a7209217b9 100644 --- a/ps3/main.c +++ b/ps3/main.c @@ -126,6 +126,7 @@ static void set_default_settings(void) strlcpy(g_console.default_sram_dir, usrDirPath, sizeof(g_console.default_sram_dir)); g_console.aspect_ratio_index = 0; strlcpy(g_console.aspect_ratio_name, "4:3", sizeof(g_console.aspect_ratio_name)); + g_console.menu_font_size = 1.0f; // g_extern g_extern.state_slot = 0; @@ -169,6 +170,7 @@ static void init_settings(void) CONFIG_GET_INT_CONSOLE(screen_orientation, "screen_orientation"); CONFIG_GET_STRING_CONSOLE(aspect_ratio_name, "aspect_ratio_name"); CONFIG_GET_STRING_CONSOLE(default_rom_startup_dir, "default_rom_startup_dir"); + CONFIG_GET_FLOAT_CONSOLE(menu_font_size, "menu_font_size"); // g_extern CONFIG_GET_INT_EXTERN(state_slot, "state_slot"); @@ -211,6 +213,7 @@ static void save_settings(void) config_set_int(conf, "screen_orientation", g_console.screen_orientation); config_set_string(conf, "aspect_ratio_name", g_console.aspect_ratio_name); config_set_string(conf, "default_rom_startup_dir", g_console.default_rom_startup_dir); + config_set_float(conf, "menu_font_size", g_console.menu_font_size); // g_extern config_set_int(conf, "state_slot", g_extern.state_slot); diff --git a/ps3/menu-port-defines.h b/ps3/menu-port-defines.h index 3c0c669afa..d1f0162657 100644 --- a/ps3/menu-port-defines.h +++ b/ps3/menu-port-defines.h @@ -16,7 +16,7 @@ * If not, see . */ -#define FONT_SIZE 1.0f +#define FONT_SIZE (g_console.menu_font_size) #define EMU_MENU_TITLE "SSNES |" #define VIDEO_MENU_TITLE "SSNES VIDEO |" #define AUDIO_MENU_TITLE "SSNES AUDIO |" diff --git a/ps3/menu.c b/ps3/menu.c index dacb2d0df3..31b415a3a8 100644 --- a/ps3/menu.c +++ b/ps3/menu.c @@ -359,6 +359,11 @@ static void set_setting_label(menu * menu_obj, int currentsetting) case SETTING_GAME_AWARE_SHADER: break; case SETTING_FONT_SIZE: + if(g_console.menu_font_size == 1.0f) + menu_obj->items[currentsetting].text_color = GREEN; + else + menu_obj->items[currentsetting].text_color = ORANGE; + snprintf(menu_obj->items[currentsetting].setting_text, sizeof(menu_obj->items[currentsetting].setting_text), "%f", g_console.menu_font_size); break; case SETTING_KEEP_ASPECT_RATIO: if(g_console.aspect_ratio_index == ASPECT_RATIO_4_3) @@ -1001,6 +1006,24 @@ static void producesettingentry(menu * menu_obj, uint64_t switchvalue) } break; case SETTING_FONT_SIZE: + if(CTRL_LEFT(state) || CTRL_LSTICK_LEFT(state) || CTRL_CROSS(state)) + { + if(g_console.menu_font_size > 0) + { + g_console.menu_font_size -= 0.01f; + set_text_message("", 7); + } + } + if(CTRL_RIGHT(state) || CTRL_LSTICK_RIGHT(state) || CTRL_CROSS(state)) + { + if((g_console.menu_font_size < 2.0f)) + { + g_console.menu_font_size += 0.01f; + set_text_message("", 7); + } + } + if(CTRL_START(state)) + g_console.menu_font_size = 1.0f; break; case SETTING_KEEP_ASPECT_RATIO: if(CTRL_LEFT(state) || CTRL_LSTICK_LEFT(state))