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

RGUI: Add 3:2 and 3:2 (centered) aspects

Browse Source
This commit is contained in:
valadaa48 2020-09-18 18:26:32 -04:00
parent 6c496eeaab
commit 63fd0aa461
19 changed files with 123 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intl/msg_hash_ar.h
View File

@ -6909,6 +6909,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_16_10_CENTRE,
"16:10 (مركز)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_3_2_CENTRE,
"3:2 (مركز)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_LOCK_NONE,
"ايقاف"

4
intl/msg_hash_chs.h
View File

@ -7065,6 +7065,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_16_10_CENTRE,
"16:10 (居中)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_3_2_CENTRE,
"3:2 (居中)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_LOCK_NONE,
"关"

4
intl/msg_hash_el.h
View File

@ -4089,6 +4089,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_16_10_CENTRE,
"16:10 (Στο Κέντρο)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_3_2_CENTRE,
"3:2 (Στο Κέντρο)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_LOCK_INTEGER,
"Ακέραια Κλίμακα"

4
intl/msg_hash_es.h
View File

@ -7301,6 +7301,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_16_10_CENTRE,
"16:10 (centrada)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_3_2_CENTRE,
"3:2 (centrada)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_LOCK_NONE,
"No"

4
intl/msg_hash_fi.h
View File

@ -4229,6 +4229,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_16_10_CENTRE,
"16:10 (keskitetty)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_3_2_CENTRE,
"3:2 (keskitetty)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_LOCK_NONE,
"POIS"

4
intl/msg_hash_fr.h
View File

@ -7317,6 +7317,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_16_10_CENTRE,
"16:10 (Centré)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_3_2_CENTRE,
"3:2 (Centré)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_LOCK_NONE,
"Désactivé"

4
intl/msg_hash_it.h
View File

@ -7249,6 +7249,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_16_10_CENTRE,
"16:10 (Centrato)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_3_2_CENTRE,
"3:2 (Centrato)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_LOCK_FIT_SCREEN,
"Adatta Schermo"

4
intl/msg_hash_ja.h
View File

@ -6661,6 +6661,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_16_10_CENTRE,
"16:10 (中央)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_3_2_CENTRE,
"3:2 (中央)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_LOCK_NONE,
"オフ"

4
intl/msg_hash_ko.h
View File

@ -7317,6 +7317,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_16_10_CENTRE,
"16:10 (가운데 맞춤)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_3_2_CENTRE,
"3:2 (가운데 맞춤)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_LOCK_NONE,
"끄기"

4
intl/msg_hash_pl.h
View File

@ -6353,6 +6353,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_16_10_CENTRE,
"16:10 (wyśrodkowany)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_3_2_CENTRE,
"3:2 (wyśrodkowany)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_LOCK_NONE,
"WYŁĄCZONE"

4
intl/msg_hash_pt_br.h
View File

@ -7249,6 +7249,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_16_10_CENTRE,
"16:10 (centralizado)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_3_2_CENTRE,
"3:2 (centralizado)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_LOCK_NONE,
"DESLIGADO"

4
intl/msg_hash_ru.h
View File

@ -7449,6 +7449,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_16_10_CENTRE,
"16:10 (Центрировано)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_3_2_CENTRE,
"3:2 (Центрировано)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_LOCK_NONE,
"ВЫКЛ"

4
intl/msg_hash_tr.h
View File

@ -7361,6 +7361,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_16_10_CENTRE,
"16:10 (Ortalanmış)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_3_2_CENTRE,
"3:2 (Ortalanmış)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_LOCK_NONE,
"KAPALI"

4
intl/msg_hash_uk.h
View File

@ -4105,6 +4105,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_16_10_CENTRE,
"16:10 (центровано)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_3_2_CENTRE,
"3:2 (центровано)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_LOCK_NONE,
"ВИМК"

8
intl/msg_hash_us.h
View File

@ -7993,6 +7993,14 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_16_10_CENTRE,
"16:10 (Centered)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_3_2,
"3:2"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_3_2_CENTRE,
"3:2 (Centered)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_LOCK_NONE,
"OFF"

43
menu/drivers/rgui.c
View File

@ -2316,6 +2316,10 @@ static void load_custom_theme(rgui_t *rgui, rgui_theme_t *theme_colors, const ch
case RGUI_ASPECT_RATIO_16_10_CENTRE:
wallpaper_key = "rgui_wallpaper_16_10";
break;
case RGUI_ASPECT_RATIO_3_2:
case RGUI_ASPECT_RATIO_3_2_CENTRE:
wallpaper_key = "rgui_wallpaper_3_2";
break;
default:
/* 4:3 */
wallpaper_key = "rgui_wallpaper";
@ -4450,6 +4454,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_3_2:
if (rgui_frame_buf.height == 240)
rgui_frame_buf.width = 360;
else
rgui_frame_buf.width = RGUI_ROUND_FB_WIDTH(
(3.0f / 2.0f) * (float)rgui_frame_buf.height);
base_term_width = rgui_frame_buf.width;
break;
case RGUI_ASPECT_RATIO_3_2_CENTRE:
if (rgui_frame_buf.height == 240)
{
rgui_frame_buf.width = 360;
base_term_width = 320;
}
else
{
rgui_frame_buf.width = RGUI_ROUND_FB_WIDTH(
(3.0f / 2.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)
@ -4509,6 +4535,19 @@ 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_3_2:
rgui_frame_buf.height = (unsigned)(
(3.0f / 2.0f) * (float)rgui_frame_buf.width);
base_term_width = rgui_frame_buf.width;
break;
case RGUI_ASPECT_RATIO_3_2_CENTRE:
rgui_frame_buf.height = (unsigned)(
(3.0f / 2.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)(
@ -5503,6 +5542,10 @@ static void rgui_frame(void *data, video_frame_info_t *video_info)
case RGUI_ASPECT_RATIO_16_10_CENTRE:
default_fb_width = 384;
break;
case RGUI_ASPECT_RATIO_3_2:
case RGUI_ASPECT_RATIO_3_2_CENTRE:
default_fb_width = 360;
break;
default:
/* 4:3 */
default_fb_width = 320;

2
menu/menu_defines.h
View File

@ -319,6 +319,8 @@ enum rgui_aspect_ratio
RGUI_ASPECT_RATIO_16_9_CENTRE,
RGUI_ASPECT_RATIO_16_10,
RGUI_ASPECT_RATIO_16_10_CENTRE,
RGUI_ASPECT_RATIO_3_2,
RGUI_ASPECT_RATIO_3_2_CENTRE,
RGUI_ASPECT_RATIO_LAST
};

12
menu/menu_setting.c
View File

@ -3812,6 +3812,18 @@ static void setting_get_string_representation_uint_rgui_aspect_ratio(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_16_10_CENTRE),
len);
break;
case RGUI_ASPECT_RATIO_3_2:
strlcpy(s,
msg_hash_to_str(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_3_2),
len);
break;
case RGUI_ASPECT_RATIO_3_2_CENTRE:
strlcpy(s,
msg_hash_to_str(
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_3_2_CENTRE),
len);
break;
}
}

2
msg_hash.h
View File

@ -2579,6 +2579,8 @@ enum msg_hash_enums
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_16_9_CENTRE,
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_16_10,
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_LOCK_NONE,
MENU_ENUM_LABEL_VALUE_RGUI_ASPECT_RATIO_LOCK_FIT_SCREEN,