diff options
author | bunnei <bunneidev@gmail.com> | 2017-03-22 03:57:31 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-22 03:57:31 +0100 |
commit | ccc3985cc0efe520bf4f53d4fcac7bfe1abdc82c (patch) | |
tree | 38120c3cf4e7af72dc8122f9f278b77aa52b663b /src/core | |
parent | Removed a linebreak from the README. (diff) | |
parent | Add custom layout settings. (diff) | |
download | yuzu-ccc3985cc0efe520bf4f53d4fcac7bfe1abdc82c.tar yuzu-ccc3985cc0efe520bf4f53d4fcac7bfe1abdc82c.tar.gz yuzu-ccc3985cc0efe520bf4f53d4fcac7bfe1abdc82c.tar.bz2 yuzu-ccc3985cc0efe520bf4f53d4fcac7bfe1abdc82c.tar.lz yuzu-ccc3985cc0efe520bf4f53d4fcac7bfe1abdc82c.tar.xz yuzu-ccc3985cc0efe520bf4f53d4fcac7bfe1abdc82c.tar.zst yuzu-ccc3985cc0efe520bf4f53d4fcac7bfe1abdc82c.zip |
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/frontend/emu_window.cpp | 26 | ||||
-rw-r--r-- | src/core/settings.h | 10 |
2 files changed, 24 insertions, 12 deletions
diff --git a/src/core/frontend/emu_window.cpp b/src/core/frontend/emu_window.cpp index 73a44bfe7..5fdb3a7e8 100644 --- a/src/core/frontend/emu_window.cpp +++ b/src/core/frontend/emu_window.cpp @@ -89,17 +89,21 @@ void EmuWindow::GyroscopeChanged(float x, float y, float z) { void EmuWindow::UpdateCurrentFramebufferLayout(unsigned width, unsigned height) { Layout::FramebufferLayout layout; - switch (Settings::values.layout_option) { - case Settings::LayoutOption::SingleScreen: - layout = Layout::SingleFrameLayout(width, height, Settings::values.swap_screen); - break; - case Settings::LayoutOption::LargeScreen: - layout = Layout::LargeFrameLayout(width, height, Settings::values.swap_screen); - break; - case Settings::LayoutOption::Default: - default: - layout = Layout::DefaultFrameLayout(width, height, Settings::values.swap_screen); - break; + if (Settings::values.custom_layout == true) { + layout = Layout::CustomFrameLayout(width, height); + } else { + switch (Settings::values.layout_option) { + case Settings::LayoutOption::SingleScreen: + layout = Layout::SingleFrameLayout(width, height, Settings::values.swap_screen); + break; + case Settings::LayoutOption::LargeScreen: + layout = Layout::LargeFrameLayout(width, height, Settings::values.swap_screen); + break; + case Settings::LayoutOption::Default: + default: + layout = Layout::DefaultFrameLayout(width, height, Settings::values.swap_screen); + break; + } } NotifyFramebufferLayoutChanged(layout); } diff --git a/src/core/settings.h b/src/core/settings.h index d1a9f0da8..03c64c94c 100644 --- a/src/core/settings.h +++ b/src/core/settings.h @@ -15,7 +15,6 @@ enum class LayoutOption { Default, SingleScreen, LargeScreen, - Custom, }; namespace NativeButton { @@ -99,6 +98,15 @@ struct Values { LayoutOption layout_option; bool swap_screen; + bool custom_layout; + u16 custom_top_left; + u16 custom_top_top; + u16 custom_top_right; + u16 custom_top_bottom; + u16 custom_bottom_left; + u16 custom_bottom_top; + u16 custom_bottom_right; + u16 custom_bottom_bottom; float bg_red; float bg_green; |