From 22f58cca5e0be7a40c8c8fbebe3d45fb68dfcf10 Mon Sep 17 00:00:00 2001
From: Morph
Date: Thu, 13 Feb 2020 23:13:23 -0500
Subject: Use enumeration instead of magic numbers

---
 src/core/frontend/framebuffer_layout.h | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/core/frontend/framebuffer_layout.h')

diff --git a/src/core/frontend/framebuffer_layout.h b/src/core/frontend/framebuffer_layout.h
index d2370adde..948c140ac 100644
--- a/src/core/frontend/framebuffer_layout.h
+++ b/src/core/frontend/framebuffer_layout.h
@@ -18,6 +18,12 @@ enum ScreenDocked : u32 {
     HeightDocked = 1080,
 };
 
+enum class Aspect {
+    AspectDefault,
+    Aspect21by9,
+    AspectStretch,
+};
+
 /// Describes the layout of the window framebuffer
 struct FramebufferLayout {
     u32 width{ScreenUndocked::Width};
-- 
cgit v1.2.3


From 20dc2e3622df0c97e4d41030fd66df1087f8ef7b Mon Sep 17 00:00:00 2001
From: Morph
Date: Fri, 14 Feb 2020 00:06:26 -0500
Subject: Address feedback

---
 src/core/frontend/framebuffer_layout.h | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'src/core/frontend/framebuffer_layout.h')

diff --git a/src/core/frontend/framebuffer_layout.h b/src/core/frontend/framebuffer_layout.h
index 948c140ac..7f6fbe468 100644
--- a/src/core/frontend/framebuffer_layout.h
+++ b/src/core/frontend/framebuffer_layout.h
@@ -19,9 +19,9 @@ enum ScreenDocked : u32 {
 };
 
 enum class Aspect {
-    AspectDefault,
+    Default,
     Aspect21by9,
-    AspectStretch,
+    StretchToWindow,
 };
 
 /// Describes the layout of the window framebuffer
@@ -54,4 +54,12 @@ FramebufferLayout DefaultFrameLayout(u32 width, u32 height);
  */
 FramebufferLayout FrameLayoutFromResolutionScale(u32 res_scale);
 
+/**
+ * Convenience method to determine emulation aspect ratio
+ * @param aspect Represents the index of aspect ratio in Settings::values.aspect_ratio
+ * @param window_aspect_ratio Current window aspect ratio
+ * @return Emulation render window aspect ratio
+ */
+float EmulationAspectRatio(Aspect aspect, float window_aspect_ratio);
+
 } // namespace Layout
-- 
cgit v1.2.3


From c3d0a0d6277c97d6e3c99914358dce15cc26871c Mon Sep 17 00:00:00 2001
From: Morph
Date: Fri, 14 Feb 2020 14:39:04 -0500
Subject: Add 4:3 aspect ratio and address feedback

---
 src/core/frontend/framebuffer_layout.h | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/core/frontend/framebuffer_layout.h')

diff --git a/src/core/frontend/framebuffer_layout.h b/src/core/frontend/framebuffer_layout.h
index 7f6fbe468..1d39c1faf 100644
--- a/src/core/frontend/framebuffer_layout.h
+++ b/src/core/frontend/framebuffer_layout.h
@@ -18,9 +18,10 @@ enum ScreenDocked : u32 {
     HeightDocked = 1080,
 };
 
-enum class Aspect {
+enum class AspectRatio {
     Default,
-    Aspect21by9,
+    R4_3,
+    R21_9,
     StretchToWindow,
 };
 
@@ -56,10 +57,10 @@ FramebufferLayout FrameLayoutFromResolutionScale(u32 res_scale);
 
 /**
  * Convenience method to determine emulation aspect ratio
- * @param aspect Represents the index of aspect ratio in Settings::values.aspect_ratio
+ * @param aspect Represents the index of aspect ratio stored in Settings::values.aspect_ratio
  * @param window_aspect_ratio Current window aspect ratio
  * @return Emulation render window aspect ratio
  */
-float EmulationAspectRatio(Aspect aspect, float window_aspect_ratio);
+float EmulationAspectRatio(AspectRatio aspect, float window_aspect_ratio);
 
 } // namespace Layout
-- 
cgit v1.2.3