From ad32fcbe78196baad3410748d212304a4ce7c118 Mon Sep 17 00:00:00 2001
From: thecozies <79979276+thecozies@users.noreply.github.com>
Date: Mon, 1 Apr 2024 12:32:47 -0500
Subject: [PATCH] update extAspectRatio for RT64 change + option rename

---
 assets/config_menu/graphics.rml | 2 +-
 src/recomp/rt64_layer.cpp       | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/assets/config_menu/graphics.rml b/assets/config_menu/graphics.rml
index 17e7441..88c8941 100644
--- a/assets/config_menu/graphics.rml
+++ b/assets/config_menu/graphics.rml
@@ -240,7 +240,7 @@
                                 id="hr_original"
                                 style="nav-up: #msaa_none; nav-down: #apply_button"
                             />
-                            <label class="config-option__tab-label" for="hr_original">None</label>
+                            <label class="config-option__tab-label" for="hr_original">Original</label>
                             <input type="radio"
                                 data-event-blur="set_current_gfx_description(-1)"
                                 data-event-focus="set_current_gfx_description(6)"
diff --git a/src/recomp/rt64_layer.cpp b/src/recomp/rt64_layer.cpp
index 5ea2461..09baf6e 100644
--- a/src/recomp/rt64_layer.cpp
+++ b/src/recomp/rt64_layer.cpp
@@ -260,14 +260,14 @@ void RT64UpdateConfig(RT64::Application* application, const ultramodern::Graphic
     switch (new_config.hr_option) {
         default:
         case ultramodern::HUDRatioMode::Original:
-            application->userConfig.extAspectPercentage = 0.0f;
+            application->userConfig.extAspectRatio = RT64::UserConfiguration::AspectRatio::Original;
             break;
         case ultramodern::HUDRatioMode::Clamp16x9:
-            // TODO: Not this lol!!!
-            application->userConfig.extAspectPercentage = 0.5f;
+            application->userConfig.extAspectRatio = RT64::UserConfiguration::AspectRatio::Manual;
+            application->userConfig.extAspectTarget = 16.0/9.0;
             break;
         case ultramodern::HUDRatioMode::Full:
-            application->userConfig.extAspectPercentage = 1.0f;
+            application->userConfig.extAspectRatio = RT64::UserConfiguration::AspectRatio::Expand;
             break;
     }