From 2b1654ad9bbd8af53f22434d350704a1a1d0a285 Mon Sep 17 00:00:00 2001 From: James Rowe Date: Tue, 3 May 2016 00:07:17 -0600 Subject: Support additional screen layouts. Allows users to choose a single screen layout or a large screen layout. Adds a configuration option to change the prominent screen. --- src/common/framebuffer_layout.h | 43 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 src/common/framebuffer_layout.h (limited to 'src/common/framebuffer_layout.h') diff --git a/src/common/framebuffer_layout.h b/src/common/framebuffer_layout.h new file mode 100644 index 000000000..c69a80732 --- /dev/null +++ b/src/common/framebuffer_layout.h @@ -0,0 +1,43 @@ +// Copyright 2016 Citra Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#pragma once + +#include "common/math_util.h" +namespace Layout { +/// Describes the layout of the window framebuffer (size and top/bottom screen positions) +struct FramebufferLayout { + unsigned width; + unsigned height; + bool top_screen_enabled; + bool bottom_screen_enabled; + MathUtil::Rectangle top_screen; + MathUtil::Rectangle bottom_screen; +}; + +/** + * Factory method for constructing a default FramebufferLayout + * @param width Window framebuffer width in pixels + * @param height Window framebuffer height in pixels + * @return Newly created FramebufferLayout object with default screen regions initialized + */ +FramebufferLayout DefaultFrameLayout(unsigned width, unsigned height, bool is_swapped); + +/** + * Factory method for constructing a FramebufferLayout with only the top screen + * @param width Window framebuffer width in pixels + * @param height Window framebuffer height in pixels + * @return Newly created FramebufferLayout object with default screen regions initialized + */ +FramebufferLayout SingleFrameLayout(unsigned width, unsigned height, bool is_swapped); + +/** + * Factory method for constructing a Frame with the a 4x size Top screen with a 1x size bottom screen on the right + * This is useful in particular because it matches well with a 1920x1080 resolution monitor + * @param width Window framebuffer width in pixels + * @param height Window framebuffer height in pixels + * @return Newly created FramebufferLayout object with default screen regions initialized + */ +FramebufferLayout LargeFrameLayout(unsigned width, unsigned height, bool is_swapped); +} \ No newline at end of file -- cgit v1.2.3 From d9305b0a074a255eb484911db70a126a6fe347b1 Mon Sep 17 00:00:00 2001 From: James Rowe Date: Sat, 5 Nov 2016 02:58:11 -0600 Subject: Add default hotkey to swap primary screens. Also minor style changes --- src/common/framebuffer_layout.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/common/framebuffer_layout.h') diff --git a/src/common/framebuffer_layout.h b/src/common/framebuffer_layout.h index c69a80732..7f88c9463 100644 --- a/src/common/framebuffer_layout.h +++ b/src/common/framebuffer_layout.h @@ -33,7 +33,8 @@ FramebufferLayout DefaultFrameLayout(unsigned width, unsigned height, bool is_sw FramebufferLayout SingleFrameLayout(unsigned width, unsigned height, bool is_swapped); /** - * Factory method for constructing a Frame with the a 4x size Top screen with a 1x size bottom screen on the right + * Factory method for constructing a Frame with the a 4x size Top screen with a 1x size bottom + * screen on the right * This is useful in particular because it matches well with a 1920x1080 resolution monitor * @param width Window framebuffer width in pixels * @param height Window framebuffer height in pixels -- cgit v1.2.3 From 793339b73a9bc87d6fa22742be4631565c2201db Mon Sep 17 00:00:00 2001 From: James Rowe Date: Thu, 10 Nov 2016 00:36:07 -0700 Subject: Round the rectangle size to prevent float to int casting issues And other minor style changes --- src/common/framebuffer_layout.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/common/framebuffer_layout.h') diff --git a/src/common/framebuffer_layout.h b/src/common/framebuffer_layout.h index 7f88c9463..a125646a3 100644 --- a/src/common/framebuffer_layout.h +++ b/src/common/framebuffer_layout.h @@ -20,14 +20,16 @@ struct FramebufferLayout { * Factory method for constructing a default FramebufferLayout * @param width Window framebuffer width in pixels * @param height Window framebuffer height in pixels + * @param is_swapped if true, the bottom screen will be displayed above the top screen * @return Newly created FramebufferLayout object with default screen regions initialized */ FramebufferLayout DefaultFrameLayout(unsigned width, unsigned height, bool is_swapped); /** - * Factory method for constructing a FramebufferLayout with only the top screen + * Factory method for constructing a FramebufferLayout with only the top or bottom screen * @param width Window framebuffer width in pixels * @param height Window framebuffer height in pixels + * @param is_swapped if true, the bottom screen will be displayed (and the top won't be displayed) * @return Newly created FramebufferLayout object with default screen regions initialized */ FramebufferLayout SingleFrameLayout(unsigned width, unsigned height, bool is_swapped); @@ -38,7 +40,8 @@ FramebufferLayout SingleFrameLayout(unsigned width, unsigned height, bool is_swa * This is useful in particular because it matches well with a 1920x1080 resolution monitor * @param width Window framebuffer width in pixels * @param height Window framebuffer height in pixels + * @param is_swapped if true, the bottom screen will be the large display * @return Newly created FramebufferLayout object with default screen regions initialized */ FramebufferLayout LargeFrameLayout(unsigned width, unsigned height, bool is_swapped); -} \ No newline at end of file +} -- cgit v1.2.3