N-archive/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #3496 from vitor-k/remove-enum

Browse source 
framebuffer_layout.h: drop the use of enum for screen dimensions
This commit is contained in:
bunnei 2020-03-12 12:00:39 -04:00 committed by GitHub
commit c21dc36cda
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/core/frontend/framebuffer_layout.cpp
View file

@ -48,8 +48,8 @@ FramebufferLayout FrameLayoutFromResolutionScale(u32 res_scale) {
u32 width, height; u32 width, height;
if (Settings::values.use_docked_mode) { if (Settings::values.use_docked_mode) {
width = ScreenDocked::WidthDocked * res_scale; width = ScreenDocked::Width * res_scale;
height = ScreenDocked::HeightDocked * res_scale; height = ScreenDocked::Height * res_scale;
} else { } else {
width = ScreenUndocked::Width * res_scale; width = ScreenUndocked::Width * res_scale;
height = ScreenUndocked::Height * res_scale; height = ScreenUndocked::Height * res_scale;

16
src/core/frontend/framebuffer_layout.h
View file

@ -8,15 +8,15 @@
namespace Layout { namespace Layout {
enum ScreenUndocked : u32 { namespace ScreenUndocked {
Width = 1280, constexpr u32 Width = 1280;
Height = 720, constexpr u32 Height = 720;
}; } // namespace ScreenUndocked
enum ScreenDocked : u32 { namespace ScreenDocked {
WidthDocked = 1920, constexpr u32 Width = 1920;
HeightDocked = 1080, constexpr u32 Height = 1080;
}; } // namespace ScreenDocked
enum class AspectRatio { enum class AspectRatio {
Default, Default,