diff options
| author | 2019-06-04 21:35:56 -0300 | |
|---|---|---|
| committer | 2019-06-04 21:35:56 -0300 | |
| commit | 2ba4aa8a3b5a646e90e3e5437c2c711179c5d849 (patch) | |
| tree | a738457c959e6b720bd270e228e69b9916544526 /src/core/frontend/framebuffer_layout.h | |
| parent | Merge pull request #2525 from FearlessTobi/remove-unused-settings (diff) | |
| parent | yuzu/bootmanager: Log out screenshot destination path (diff) | |
| download | yuzu-2ba4aa8a3b5a646e90e3e5437c2c711179c5d849.tar.gz yuzu-2ba4aa8a3b5a646e90e3e5437c2c711179c5d849.tar.xz yuzu-2ba4aa8a3b5a646e90e3e5437c2c711179c5d849.zip | |
Merge pull request #2529 from lioncash/boot
yuzu/bootmanager: Minor interface tidying
Diffstat (limited to 'src/core/frontend/framebuffer_layout.h')
| -rw-r--r-- | src/core/frontend/framebuffer_layout.h | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/src/core/frontend/framebuffer_layout.h b/src/core/frontend/framebuffer_layout.h index c2c63d08c..d2370adde 100644 --- a/src/core/frontend/framebuffer_layout.h +++ b/src/core/frontend/framebuffer_layout.h | |||
| @@ -8,15 +8,22 @@ | |||
| 8 | 8 | ||
| 9 | namespace Layout { | 9 | namespace Layout { |
| 10 | 10 | ||
| 11 | enum ScreenUndocked : unsigned { Width = 1280, Height = 720 }; | 11 | enum ScreenUndocked : u32 { |
| 12 | enum ScreenDocked : unsigned { WidthDocked = 1920, HeightDocked = 1080 }; | 12 | Width = 1280, |
| 13 | Height = 720, | ||
| 14 | }; | ||
| 15 | |||
| 16 | enum ScreenDocked : u32 { | ||
| 17 | WidthDocked = 1920, | ||
| 18 | HeightDocked = 1080, | ||
| 19 | }; | ||
| 13 | 20 | ||
| 14 | /// Describes the layout of the window framebuffer | 21 | /// Describes the layout of the window framebuffer |
| 15 | struct FramebufferLayout { | 22 | struct FramebufferLayout { |
| 16 | unsigned width{ScreenUndocked::Width}; | 23 | u32 width{ScreenUndocked::Width}; |
| 17 | unsigned height{ScreenUndocked::Height}; | 24 | u32 height{ScreenUndocked::Height}; |
| 18 | 25 | ||
| 19 | Common::Rectangle<unsigned> screen; | 26 | Common::Rectangle<u32> screen; |
| 20 | 27 | ||
| 21 | /** | 28 | /** |
| 22 | * Returns the ration of pixel size of the screen, compared to the native size of the undocked | 29 | * Returns the ration of pixel size of the screen, compared to the native size of the undocked |
| @@ -33,12 +40,12 @@ struct FramebufferLayout { | |||
| 33 | * @param height Window framebuffer height in pixels | 40 | * @param height Window framebuffer height in pixels |
| 34 | * @return Newly created FramebufferLayout object with default screen regions initialized | 41 | * @return Newly created FramebufferLayout object with default screen regions initialized |
| 35 | */ | 42 | */ |
| 36 | FramebufferLayout DefaultFrameLayout(unsigned width, unsigned height); | 43 | FramebufferLayout DefaultFrameLayout(u32 width, u32 height); |
| 37 | 44 | ||
| 38 | /** | 45 | /** |
| 39 | * Convenience method to get frame layout by resolution scale | 46 | * Convenience method to get frame layout by resolution scale |
| 40 | * @param res_scale resolution scale factor | 47 | * @param res_scale resolution scale factor |
| 41 | */ | 48 | */ |
| 42 | FramebufferLayout FrameLayoutFromResolutionScale(u16 res_scale); | 49 | FramebufferLayout FrameLayoutFromResolutionScale(u32 res_scale); |
| 43 | 50 | ||
| 44 | } // namespace Layout | 51 | } // namespace Layout |