From 2d3fd621bfe67312b80e27c04945eefbea6e90d4 Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Tue, 10 Nov 2020 23:35:49 +1000
Subject: [PATCH] Settings: Add 19:9 aspect ratio

---
 android/app/src/main/res/values/arrays.xml           |  4 ++++
 src/core/settings.cpp                                |  8 ++++----
 src/core/types.h                                     |  1 +
 src/duckstation-libretro/libretro_host_interface.cpp | 10 +++++++++-
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/android/app/src/main/res/values/arrays.xml b/android/app/src/main/res/values/arrays.xml
index 5392263ab..ff751334f 100644
--- a/android/app/src/main/res/values/arrays.xml
+++ b/android/app/src/main/res/values/arrays.xml
@@ -81,6 +81,8 @@
         <item>4:3</item>
         <item>16:9</item>
         <item>16:10</item>
+        <item>19:9</item>
+        <item>21:9</item>
         <item>8:7</item>
         <item>2:1 (VRAM 1:1)</item>
         <item>1:1</item>
@@ -90,6 +92,8 @@
         <item>4:3</item>
         <item>16:9</item>
         <item>16:10</item>
+        <item>19:9</item>
+        <item>21:9</item>
         <item>8:7</item>
         <item>2:1 (VRAM 1:1)</item>
         <item>1:1</item>
diff --git a/src/core/settings.cpp b/src/core/settings.cpp
index 05e815453..6edc37c03 100644
--- a/src/core/settings.cpp
+++ b/src/core/settings.cpp
@@ -579,10 +579,10 @@ const char* Settings::GetDisplayCropModeDisplayName(DisplayCropMode crop_mode)
   return s_display_crop_mode_display_names[static_cast<int>(crop_mode)];
 }
 
-static std::array<const char*, 8> s_display_aspect_ratio_names = {
-  {"4:3", "16:9", "16:10", "21:9", "8:7", "2:1 (VRAM 1:1)", "1:1", "PAR 1:1"}};
-static constexpr std::array<float, 8> s_display_aspect_ratio_values = {
-  {4.0f / 3.0f, 16.0f / 9.0f, 16.0f / 10.0f, 21.0f / 9.0f, 8.0f / 7.0f, 2.0f / 1.0f, 1.0f, -1.0f}};
+static std::array<const char*, 9> s_display_aspect_ratio_names = {
+  {"4:3", "16:9", "16:10", "19:9", "21:9", "8:7", "2:1 (VRAM 1:1)", "1:1", "PAR 1:1"}};
+static constexpr std::array<float, 9> s_display_aspect_ratio_values = {
+  {4.0f / 3.0f, 16.0f / 9.0f, 16.0f / 10.0f, 19.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)
 {
diff --git a/src/core/types.h b/src/core/types.h
index 90f2cef82..10bd208f7 100644
--- a/src/core/types.h
+++ b/src/core/types.h
@@ -88,6 +88,7 @@ enum class DisplayAspectRatio : u8
   R4_3,
   R16_9,
   R16_10,
+  R19_9,
   R21_9,
   R8_7,
   R2_1,
diff --git a/src/duckstation-libretro/libretro_host_interface.cpp b/src/duckstation-libretro/libretro_host_interface.cpp
index f2a12c2b6..76cb40e2f 100644
--- a/src/duckstation-libretro/libretro_host_interface.cpp
+++ b/src/duckstation-libretro/libretro_host_interface.cpp
@@ -666,7 +666,15 @@ static std::array<retro_core_option_definition, 42> s_option_definitions = {{
   {"duckstation_Display.AspectRatio",
    "Aspect Ratio",
    "Sets the core-provided aspect ratio.",
-   {{"4:3", "4:3"}, {"16:9", "16:9"}, {"2:1", "2:1 (VRAM 1:1)"}, {"1:1", "1:1"}},
+   {{"4:3", "4:3"},
+    {"16:9", "16:9"},
+    {"16:10", "16:10"},
+    {"19:9", "19:9"},
+    {"21:9", "21:9"},
+    {"8:7", "8:7"},
+    {"2:1 (VRAM 1:1)", "2:1 (VRAM 1:1)"},
+    {"1:1", "1:1"},
+    {"PAR 1:1", "PAR 1:1"}},
    "4:3"},
   {"duckstation_Main.LoadDevicesFromSaveStates",
    "Load Devices From Save States",