diff --git a/360/menu.cpp b/360/menu.cpp index 6fafc5c1b4..ba24aca407 100644 --- a/360/menu.cpp +++ b/360/menu.cpp @@ -349,8 +349,8 @@ HRESULT CRetroArchQuickMenu::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled break; case MENU_ITEM_KEEP_ASPECT_RATIO: { - g_console.aspect_ratio_index++; - if(g_console.aspect_ratio_index >= ASPECT_RATIO_END) + rarch_settings_change(S_ASPECT_RATIO_INCREMENT); + if(g_console.aspect_ratio_index == ASPECT_RATIO_END) g_console.aspect_ratio_index = 0; gfx_ctx_set_aspect_ratio(d3d9, g_console.aspect_ratio_index); diff --git a/console/console_settings.c b/console/console_settings.c index bc92d0094b..ef3fc5d953 100644 --- a/console/console_settings.c +++ b/console/console_settings.c @@ -26,6 +26,14 @@ void rarch_settings_change(unsigned setting) { switch(setting) { + case S_ASPECT_RATIO_DECREMENT: + if(g_console.aspect_ratio_index > 0) + g_console.aspect_ratio_index--; + break; + case S_ASPECT_RATIO_INCREMENT: + if(g_console.aspect_ratio_index < ASPECT_RATIO_END-1) + g_console.aspect_ratio_index++; + break; case S_FRAME_ADVANCE: g_console.frame_advance_enable = true; g_console.menu_enable = false; @@ -117,6 +125,9 @@ void rarch_settings_default(unsigned setting) { switch(setting) { + case S_DEF_ASPECT_RATIO: + g_console.aspect_ratio_index = ASPECT_RATIO_4_3; + break; case S_DEF_HW_TEXTURE_FILTER: g_settings.video.smooth = 1; break; @@ -158,11 +169,11 @@ void rarch_settings_msg(unsigned setting, unsigned delay) case S_MSG_CACHE_PARTITION: snprintf(str, sizeof(str), "INFO - All the contents of the ZIP files you have selected in the filebrowser\nare extracted to this partition."); break; - case S_MSG_CHANGE_CONTROLS: + case S_MSG_CHANGE_CONTROLS: snprintf(str, sizeof(str), "INFO - Press LEFT/RIGHT to change the controls, and press\n[RetroPad Start] to reset a button to default values."); - break; - case S_MSG_EXTRACTED_ZIPFILE: - snprintf(str, sizeof(str), "INFO - ZIP file extracted to cache partition."); + break; + case S_MSG_EXTRACTED_ZIPFILE: + snprintf(str, sizeof(str), "INFO - ZIP file successfully extracted to cache partition."); break; case S_MSG_NOT_IMPLEMENTED: snprintf(str, sizeof(str), "TODO - Not yet implemented."); diff --git a/console/console_settings.h b/console/console_settings.h index a10461eecf..817d11fbdd 100644 --- a/console/console_settings.h +++ b/console/console_settings.h @@ -25,7 +25,9 @@ enum enum { - S_FRAME_ADVANCE = 0, + S_ASPECT_RATIO_DECREMENT = 0, + S_ASPECT_RATIO_INCREMENT, + S_FRAME_ADVANCE, S_HW_TEXTURE_FILTER, S_HW_TEXTURE_FILTER_2, S_OVERSCAN_DECREMENT, @@ -49,7 +51,8 @@ enum enum { - S_DEF_HW_TEXTURE_FILTER = 0, + S_DEF_ASPECT_RATIO = 0, + S_DEF_HW_TEXTURE_FILTER, S_DEF_HW_TEXTURE_FILTER_2, S_DEF_OVERSCAN, S_DEF_THROTTLE,