Merge pull request #893 from mirrornoir/patch-2

Add 21:9 to the Aspect Ratio settings
This commit is contained in:
Connor McLaughlin 2020-09-26 01:11:32 +10:00 committed by GitHub
commit 83bfa78493
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -520,10 +520,10 @@ const char* Settings::GetDisplayCropModeDisplayName(DisplayCropMode crop_mode)
return s_display_crop_mode_display_names[static_cast<int>(crop_mode)]; return s_display_crop_mode_display_names[static_cast<int>(crop_mode)];
} }
static std::array<const char*, 6> s_display_aspect_ratio_names = { static std::array<const char*, 7> s_display_aspect_ratio_names = {
{"4:3", "16:9", "8:7", "2:1 (VRAM 1:1)", "1:1", "PAR 1:1"}}; {"4:3", "16:9", "21:9", "8:7", "2:1 (VRAM 1:1)", "1:1", "PAR 1:1"}};
static constexpr std::array<float, 6> s_display_aspect_ratio_values = { static constexpr std::array<float, 7> s_display_aspect_ratio_values = {
{4.0f / 3.0f, 16.0f / 9.0f, 8.0f / 7.0f, 2.0f / 1.0f, 1.0f, -1.0f}}; {4.0f / 3.0f, 16.0f / 9.0f, 21.0f / 9.0f, 8.0f / 7.0f, 2.0f / 1.0f, 1.0f, -1.0f}};
std::optional<DisplayAspectRatio> Settings::ParseDisplayAspectRatio(const char* str) std::optional<DisplayAspectRatio> Settings::ParseDisplayAspectRatio(const char* str)
{ {