From e58cec4f0549ce2e694a641292b73975d24ca669 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 27 Sep 2013 20:32:29 +0200 Subject: [PATCH] (RMenu) Take out SETTING_FONT_SIZE --- frontend/menu/rgui.c | 1 + frontend/menu/rmenu.c | 21 --------------------- frontend/menu/rmenu.h | 1 - 3 files changed, 1 insertion(+), 22 deletions(-) diff --git a/frontend/menu/rgui.c b/frontend/menu/rgui.c index fe3d81aaaf..74a68c5fb5 100644 --- a/frontend/menu/rgui.c +++ b/frontend/menu/rgui.c @@ -2689,6 +2689,7 @@ static int rgui_iterate(void *data, unsigned action) return rgui_settings_iterate(rgui, action); else if (menu_type == RGUI_SETTINGS_CUSTOM_VIEWPORT || menu_type == RGUI_SETTINGS_CUSTOM_VIEWPORT_2) return rgui_viewport_iterate(rgui, action); + if (rgui->need_refresh && action != RGUI_ACTION_MESSAGE) action = RGUI_ACTION_NOOP; diff --git a/frontend/menu/rmenu.c b/frontend/menu/rmenu.c index e07168f30e..4d029f3919 100644 --- a/frontend/menu/rmenu.c +++ b/frontend/menu/rmenu.c @@ -1137,23 +1137,6 @@ static int set_setting_action(uint8_t menu_type, unsigned switchvalue, uint64_t break; } break; - case SETTING_FONT_SIZE: - switch (action) - { - case RGUI_ACTION_LEFT: - if (g_settings.video.font_size > 0) - g_settings.video.font_size -= 0.01f; - break; - case RGUI_ACTION_RIGHT: - case RGUI_ACTION_OK: - if ((g_settings.video.font_size < 2.0f)) - g_settings.video.font_size += 0.01f; - break; - case RGUI_ACTION_START: - g_settings.video.font_size = 1.0f; - break; - } - break; case SETTING_ASPECT_RATIO: switch (action) { @@ -2117,10 +2100,6 @@ static int select_setting(void *data, uint64_t action) strlcpy(text, "Menu Skin", sizeof(text)); strlcpy(setting_text, fname, sizeof(setting_text)); break; - case SETTING_FONT_SIZE: - strlcpy(text, "Font Size", sizeof(text)); - snprintf(setting_text, sizeof(setting_text), "%f", g_settings.video.font_size); - break; case SETTING_HW_TEXTURE_FILTER: strlcpy(text, "Default Filter", sizeof(text)); if (g_settings.video.smooth) diff --git a/frontend/menu/rmenu.h b/frontend/menu/rmenu.h index 8f0f75f262..b22932ed46 100644 --- a/frontend/menu/rmenu.h +++ b/frontend/menu/rmenu.h @@ -74,7 +74,6 @@ enum { SETTING_REWIND_ENABLED, SETTING_REWIND_GRANULARITY, - SETTING_FONT_SIZE, SETTING_EMU_SHOW_DEBUG_INFO_MSG, SETTING_EMU_SHOW_INFO_MSG, SETTING_EMU_SKIN,