summaryrefslogtreecommitdiffstats
path: root/src/core/frontend
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/frontend')
-rw-r--r--src/core/frontend/framebuffer_layout.cpp14
-rw-r--r--src/core/frontend/framebuffer_layout.h9
2 files changed, 13 insertions, 10 deletions
diff --git a/src/core/frontend/framebuffer_layout.cpp b/src/core/frontend/framebuffer_layout.cpp
index 1b4f0255e..2dc795d56 100644
--- a/src/core/frontend/framebuffer_layout.cpp
+++ b/src/core/frontend/framebuffer_layout.cpp
@@ -28,8 +28,8 @@ FramebufferLayout DefaultFrameLayout(u32 width, u32 height) {
FramebufferLayout res{width, height};
const float window_aspect_ratio = static_cast<float>(height) / width;
- float emulation_aspect_ratio = EmulationAspectRatio(
- static_cast<Aspect>(Settings::values.aspect_ratio), window_aspect_ratio);
+ const float emulation_aspect_ratio = EmulationAspectRatio(
+ static_cast<AspectRatio>(Settings::values.aspect_ratio), window_aspect_ratio);
const Common::Rectangle<u32> screen_window_area{0, 0, width, height};
Common::Rectangle<u32> screen = MaxRectangle(screen_window_area, emulation_aspect_ratio);
@@ -58,13 +58,15 @@ FramebufferLayout FrameLayoutFromResolutionScale(u32 res_scale) {
return DefaultFrameLayout(width, height);
}
-float EmulationAspectRatio(Aspect aspect, float window_aspect_ratio) {
+float EmulationAspectRatio(AspectRatio aspect, float window_aspect_ratio) {
switch (aspect) {
- case Aspect::Default:
+ case AspectRatio::Default:
return static_cast<float>(ScreenUndocked::Height) / ScreenUndocked::Width;
- case Aspect::Aspect21by9:
+ case AspectRatio::R4_3:
+ return 3.0f / 4.0f;
+ case AspectRatio::R21_9:
return 9.0f / 21.0f;
- case Aspect::StretchToWindow:
+ case AspectRatio::StretchToWindow:
return window_aspect_ratio;
default:
return static_cast<float>(ScreenUndocked::Height) / ScreenUndocked::Width;
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