Merge pull request #3496 from vitor-k/remove-enum
framebuffer_layout.h: drop the use of enum for screen dimensions
This commit is contained in:
commit
c21dc36cda
@ -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;
|
||||||
|
@ -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,
|
||||||
|
Loading…
Reference in New Issue
Block a user