From d9275b77570562a94c726f3fe630886c96850396 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Tue, 15 Aug 2023 22:42:28 -0400
Subject: yuzu-qt: Enable specifying screenshot resolution

---
 src/yuzu/uisettings.cpp | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

(limited to 'src/yuzu/uisettings.cpp')

diff --git a/src/yuzu/uisettings.cpp b/src/yuzu/uisettings.cpp
index f03dc01dd..3ab0d1b45 100644
--- a/src/yuzu/uisettings.cpp
+++ b/src/yuzu/uisettings.cpp
@@ -36,4 +36,35 @@ bool IsDarkTheme() {
 
 Values values = {};
 
+u32 CalculateWidth(u32 height, Settings::AspectRatio ratio) {
+    switch (ratio) {
+    case Settings::AspectRatio::R4_3:
+        return height * 4 / 3;
+    case Settings::AspectRatio::R21_9:
+        return height * 21 / 9;
+    case Settings::AspectRatio::R16_10:
+        return height * 16 / 10;
+    case Settings::AspectRatio::R16_9:
+    case Settings::AspectRatio::Stretch:
+        break;
+    }
+    return height * 16 / 9;
+}
+
+Settings::AspectRatio ConvertScreenshotRatioToRatio(Settings::ScreenshotAspectRatio ratio) {
+    switch (ratio) {
+    case Settings::ScreenshotAspectRatio::Auto:
+        return Settings::values.aspect_ratio.GetValue();
+    case Settings::ScreenshotAspectRatio::R16_9:
+        return Settings::AspectRatio::R16_9;
+    case Settings::ScreenshotAspectRatio::R4_3:
+        return Settings::AspectRatio::R4_3;
+    case Settings::ScreenshotAspectRatio::R21_9:
+        return Settings::AspectRatio::R21_9;
+    case Settings::ScreenshotAspectRatio::R16_10:
+        return Settings::AspectRatio::R16_10;
+    }
+    return Settings::AspectRatio::R16_9;
+}
+
 } // namespace UISettings
-- 
cgit v1.2.3


From 96c98d09cb9200c9b623404381c33b3379411eeb Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Wed, 16 Aug 2023 00:18:47 -0400
Subject: yuzu-qt: Implement unspecified screenshot ratio

---
 src/yuzu/uisettings.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/yuzu/uisettings.cpp')

diff --git a/src/yuzu/uisettings.cpp b/src/yuzu/uisettings.cpp
index 3ab0d1b45..606268a5f 100644
--- a/src/yuzu/uisettings.cpp
+++ b/src/yuzu/uisettings.cpp
@@ -63,6 +63,8 @@ Settings::AspectRatio ConvertScreenshotRatioToRatio(Settings::ScreenshotAspectRa
         return Settings::AspectRatio::R21_9;
     case Settings::ScreenshotAspectRatio::R16_10:
         return Settings::AspectRatio::R16_10;
+    case Settings::ScreenshotAspectRatio::Unspecified:
+        break;
     }
     return Settings::AspectRatio::R16_9;
 }
-- 
cgit v1.2.3


From 6fe51b48e960e81b1304d833b2d69b468a4a238a Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Wed, 16 Aug 2023 16:12:42 -0400
Subject: yuzu-qt: Screenshots depend more on the graphics settings

---
 src/yuzu/uisettings.cpp | 18 ------------------
 1 file changed, 18 deletions(-)

(limited to 'src/yuzu/uisettings.cpp')

diff --git a/src/yuzu/uisettings.cpp b/src/yuzu/uisettings.cpp
index 606268a5f..78f927ba9 100644
--- a/src/yuzu/uisettings.cpp
+++ b/src/yuzu/uisettings.cpp
@@ -51,22 +51,4 @@ u32 CalculateWidth(u32 height, Settings::AspectRatio ratio) {
     return height * 16 / 9;
 }
 
-Settings::AspectRatio ConvertScreenshotRatioToRatio(Settings::ScreenshotAspectRatio ratio) {
-    switch (ratio) {
-    case Settings::ScreenshotAspectRatio::Auto:
-        return Settings::values.aspect_ratio.GetValue();
-    case Settings::ScreenshotAspectRatio::R16_9:
-        return Settings::AspectRatio::R16_9;
-    case Settings::ScreenshotAspectRatio::R4_3:
-        return Settings::AspectRatio::R4_3;
-    case Settings::ScreenshotAspectRatio::R21_9:
-        return Settings::AspectRatio::R21_9;
-    case Settings::ScreenshotAspectRatio::R16_10:
-        return Settings::AspectRatio::R16_10;
-    case Settings::ScreenshotAspectRatio::Unspecified:
-        break;
-    }
-    return Settings::AspectRatio::R16_9;
-}
-
 } // namespace UISettings
-- 
cgit v1.2.3


From 6af8cca2c1596f935cc9f71bf8b4b1497b9db5f7 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Wed, 16 Aug 2023 22:57:19 -0400
Subject: uisettings: Add TODO for stretched aspect being ignored

---
 src/yuzu/uisettings.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/yuzu/uisettings.cpp')

diff --git a/src/yuzu/uisettings.cpp b/src/yuzu/uisettings.cpp
index 78f927ba9..1c833767b 100644
--- a/src/yuzu/uisettings.cpp
+++ b/src/yuzu/uisettings.cpp
@@ -46,6 +46,7 @@ u32 CalculateWidth(u32 height, Settings::AspectRatio ratio) {
         return height * 16 / 10;
     case Settings::AspectRatio::R16_9:
     case Settings::AspectRatio::Stretch:
+        // TODO: Move this function wherever appropriate to implement Stretched aspect
         break;
     }
     return height * 16 / 9;
-- 
cgit v1.2.3