diff options
| author | bunnei <bunneidev@gmail.com> | 2020-03-12 17:00:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-12 17:00:39 +0100 |
| commit | c21dc36cdaadccd507f0c24c562689138c75e6f2 (patch) | |
| tree | 2f82b40c1310baa50e541c321497ad7d87a816cc /src | |
| parent | Merge pull request #3494 from ReinUsesLisp/fix-cs-pipeline (diff) | |
| parent | framebuffer_layout.h: drop the use of enum for screen dimensions. (diff) | |
| download | yuzu-c21dc36cdaadccd507f0c24c562689138c75e6f2.tar yuzu-c21dc36cdaadccd507f0c24c562689138c75e6f2.tar.gz yuzu-c21dc36cdaadccd507f0c24c562689138c75e6f2.tar.bz2 yuzu-c21dc36cdaadccd507f0c24c562689138c75e6f2.tar.lz yuzu-c21dc36cdaadccd507f0c24c562689138c75e6f2.tar.xz yuzu-c21dc36cdaadccd507f0c24c562689138c75e6f2.tar.zst yuzu-c21dc36cdaadccd507f0c24c562689138c75e6f2.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/frontend/framebuffer_layout.cpp | 4 | ||||
| -rw-r--r-- | src/core/frontend/framebuffer_layout.h | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/core/frontend/framebuffer_layout.cpp b/src/core/frontend/framebuffer_layout.cpp index 2dc795d56..68a0e0906 100644 --- a/src/core/frontend/framebuffer_layout.cpp +++ b/src/core/frontend/framebuffer_layout.cpp @@ -48,8 +48,8 @@ FramebufferLayout FrameLayoutFromResolutionScale(u32 res_scale) { u32 width, height; if (Settings::values.use_docked_mode) { - width = ScreenDocked::WidthDocked * res_scale; - height = ScreenDocked::HeightDocked * res_scale; + width = ScreenDocked::Width * res_scale; + height = ScreenDocked::Height * res_scale; } else { width = ScreenUndocked::Width * res_scale; height = ScreenUndocked::Height * res_scale; diff --git a/src/core/frontend/framebuffer_layout.h b/src/core/frontend/framebuffer_layout.h index e9d0a40d3..15ecfb13d 100644 --- a/src/core/frontend/framebuffer_layout.h +++ b/src/core/frontend/framebuffer_layout.h @@ -8,15 +8,15 @@ namespace Layout { -enum ScreenUndocked : u32 { - Width = 1280, - Height = 720, -}; +namespace ScreenUndocked { +constexpr u32 Width = 1280; +constexpr u32 Height = 720; +} // namespace ScreenUndocked -enum ScreenDocked : u32 { - WidthDocked = 1920, - HeightDocked = 1080, -}; +namespace ScreenDocked { +constexpr u32 Width = 1920; +constexpr u32 Height = 1080; +} // namespace ScreenDocked enum class AspectRatio { Default, |