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

[RGUI] Added 5:3 and 5:3 (centered) options for changing rgui aspect ratio (#12072)

Browse Source 
* Added 5:3 and 5:3 (centered) options for changing rgui aspect ratio

* Fixed option label
This commit is contained in:
Job Adrian Salinas Gonzalez 2021-02-23 20:58:48 -06:00 committed by GitHub
parent 002edcec82
commit de4138b45c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 116 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intl/msg_hash_chs.h
View File

@ -7574,6 +7574,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_3_2_CENTRE,
"3:2 (居中)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_5_3_CENTRE,
"5:3 (居中)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_LOCK_NONE,
"关"

4
intl/msg_hash_de.h
View File

@ -7462,6 +7462,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_3_2_CENTRE,
"3:2 (zentriert)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_5_3_CENTRE,
"5:3 (zentriert)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_LOCK_NONE,
"AUS"

4
intl/msg_hash_es.h
View File

@ -7622,6 +7622,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_3_2_CENTRE,
"3:2 (centrada)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_5_3_CENTRE,
"5:3 (centrada)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_LOCK_NONE,
"No"

4
intl/msg_hash_fi.h
View File

@ -6754,6 +6754,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_3_2_CENTRE,
"3:2 (keskitetty)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_5_3_CENTRE,
"5:3 (keskitetty)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_LOCK_NONE,
"POIS"

4
intl/msg_hash_fr.h
View File

@ -7638,6 +7638,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_3_2_CENTRE,
"3:2 (Centré)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_5_3_CENTRE,
"5:3 (Centré)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_LOCK_NONE,
"Désactivé"

4
intl/msg_hash_it.h
View File

@ -7558,6 +7558,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_3_2_CENTRE,
"3:2 (Centrato)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_5_3_CENTRE,
"5:3 (Centrato)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_LOCK_NONE,
"Disattivato"

4
intl/msg_hash_ko.h
View File

@ -7646,6 +7646,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_3_2_CENTRE,
"3:2 (가운데 맞춤)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_5_3_CENTRE,
"5:3 (가운데 맞춤)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_LOCK_NONE,
"끄기"

4
intl/msg_hash_pl.h
View File

@ -7674,6 +7674,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_3_2_CENTRE,
"3:2 (wypośrodkowane)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_5_3_CENTRE,
"5:3 (wypośrodkowane)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_LOCK_NONE,
"WYŁĄCZONE"

4
intl/msg_hash_pt_br.h
View File

@ -7566,6 +7566,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_3_2_CENTRE,
"3:2 (centralizado)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_5_3_CENTRE,
"5:3 (centralizado)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_LOCK_NONE,
"DESLIGADO"

4
intl/msg_hash_ru.h
View File

@ -7702,6 +7702,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_3_2_CENTRE,
"3:2 (по центру)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_5_3_CENTRE,
"5:3 (по центру)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_LOCK_NONE,
"ВЫКЛ"

4
intl/msg_hash_tr.h
View File

@ -7678,6 +7678,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_3_2_CENTRE,
"3:2 (Ortalanmış)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_5_3_CENTRE,
"5:3 (Ortalanmış)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_LOCK_NONE,
"KAPALI"

8
intl/msg_hash_us.h
View File

@ -8274,6 +8274,14 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_3_2_CENTRE,
"3:2 (Centered)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_5_3,
"5:3"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_5_3_CENTRE,
"5:3 (Centered)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_LOCK_NONE,
"OFF"

45
menu/drivers/rgui.c
View File

@ -2521,6 +2521,10 @@ static void load_custom_theme(rgui_t *rgui, rgui_theme_t *theme_colors, const ch
case RGUI_ASPECT_RATIO_3_2_CENTRE:
wallpaper_key = "rgui_wallpaper_3_2";
break;
case RGUI_ASPECT_RATIO_5_3:
case RGUI_ASPECT_RATIO_5_3_CENTRE:
wallpaper_key = "rgui_wallpaper_5_3";
break;
default:
/* 4:3 */
wallpaper_key = "rgui_wallpaper";
@ -5014,6 +5018,28 @@ static bool rgui_set_aspect_ratio(rgui_t *rgui, bool delay_update)
( 4.0f / 3.0f) * (float)rgui->frame_buf.height);
}
break;
case RGUI_ASPECT_RATIO_5_3:
if (rgui->frame_buf.height == 240)
rgui->frame_buf.width = 400;
else
rgui->frame_buf.width = RGUI_ROUND_FB_WIDTH(
(5.0f / 3.0f) * (float)rgui->frame_buf.height);
base_term_width = rgui->frame_buf.width;
break;
case RGUI_ASPECT_RATIO_5_3_CENTRE:
if (rgui->frame_buf.height == 240)
{
rgui->frame_buf.width = 400;
base_term_width = 320;
}
else
{
rgui->frame_buf.width = RGUI_ROUND_FB_WIDTH(
(5.0f / 3.0f) * (float)rgui->frame_buf.height);
base_term_width = RGUI_ROUND_FB_WIDTH(
( 4.0f / 3.0f) * (float)rgui->frame_buf.height);
}
break;
default:
/* 4:3 */
if (rgui->frame_buf.height == 240)
@ -5086,6 +5112,20 @@ static bool rgui_set_aspect_ratio(rgui_t *rgui, bool delay_update)
base_term_width = (base_term_width < RGUI_MIN_FB_WIDTH) ?
RGUI_MIN_FB_WIDTH : base_term_width;
break;
case RGUI_ASPECT_RATIO_5_3:
rgui->frame_buf.height = (unsigned)(
(5.0f / 3.0f) * (float)rgui->frame_buf.width);
base_term_width = rgui->frame_buf.width;
break;
case RGUI_ASPECT_RATIO_5_3_CENTRE:
rgui->frame_buf.height = (unsigned)(
(5.0f / 3.0f) * (float)rgui->frame_buf.width);
base_term_width = RGUI_ROUND_FB_WIDTH(
( 4.0f / 3.0f) * (float)rgui->frame_buf.height);
base_term_width = (base_term_width < RGUI_MIN_FB_WIDTH) ?
RGUI_MIN_FB_WIDTH : base_term_width;
break;
default:
/* 4:3 */
rgui->frame_buf.height = (unsigned)(
@ -6143,6 +6183,11 @@ static void rgui_frame(void *data, video_frame_info_t *video_info)
case RGUI_ASPECT_RATIO_3_2_CENTRE:
default_fb_width = 360;
break;
case RGUI_ASPECT_RATIO_5_3:
case RGUI_ASPECT_RATIO_5_3_CENTRE:
default_fb_width = 400;
break;
default:
/* 4:3 */
default_fb_width = 320;

3
menu/menu_defines.h
View File

@ -332,6 +332,9 @@ enum rgui_aspect_ratio
RGUI_ASPECT_RATIO_16_10_CENTRE,
RGUI_ASPECT_RATIO_3_2,
RGUI_ASPECT_RATIO_3_2_CENTRE,
RGUI_ASPECT_RATIO_5_3,
RGUI_ASPECT_RATIO_5_3_CENTRE,
RGUI_ASPECT_RATIO_LAST
};

13
menu/menu_setting.c
View File

@ -3950,6 +3950,19 @@ static void setting_get_string_representation_uint_rgui_aspect_ratio(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_3_2_CENTRE),
len);
break;
case RGUI_ASPECT_RATIO_5_3:
strlcpy(s,
msg_hash_to_str(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_5_3),
len);
break;
case RGUI_ASPECT_RATIO_5_3_CENTRE:
strlcpy(s,
msg_hash_to_str(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_5_3_CENTRE),
len);
break;
}
}

3
msg_hash.h
View File

@ -2659,6 +2659,9 @@ enum msg_hash_enums
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_16_10_CENTRE,
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_3_2,
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_3_2_CENTRE,
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_5_3,
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_5_3_CENTRE,
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_LOCK_NONE,
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_LOCK_FIT_SCREEN,