diff options
| author | 2018-01-09 22:36:07 -0500 | |
|---|---|---|
| committer | 2018-01-10 23:28:43 -0500 | |
| commit | 482cf8a005a3c13ac7239995fdbe2e78d12984b9 (patch) | |
| tree | 0e29fe56ada3a97a1f753ad68e1430e98f66e303 /src/citra/emu_window/emu_window_sdl2.cpp | |
| parent | NV: Move the nv device nodes to their own directory and namespace. (diff) | |
| download | yuzu-482cf8a005a3c13ac7239995fdbe2e78d12984b9.tar.gz yuzu-482cf8a005a3c13ac7239995fdbe2e78d12984b9.tar.xz yuzu-482cf8a005a3c13ac7239995fdbe2e78d12984b9.zip | |
frontend: Update for undocked Switch screen layout.
Diffstat (limited to 'src/citra/emu_window/emu_window_sdl2.cpp')
| -rw-r--r-- | src/citra/emu_window/emu_window_sdl2.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/citra/emu_window/emu_window_sdl2.cpp b/src/citra/emu_window/emu_window_sdl2.cpp index 25643715a..e65b04e4b 100644 --- a/src/citra/emu_window/emu_window_sdl2.cpp +++ b/src/citra/emu_window/emu_window_sdl2.cpp | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #include "common/logging/log.h" | 12 | #include "common/logging/log.h" |
| 13 | #include "common/scm_rev.h" | 13 | #include "common/scm_rev.h" |
| 14 | #include "common/string_util.h" | 14 | #include "common/string_util.h" |
| 15 | #include "core/3ds.h" | ||
| 16 | #include "core/settings.h" | 15 | #include "core/settings.h" |
| 17 | #include "input_common/keyboard.h" | 16 | #include "input_common/keyboard.h" |
| 18 | #include "input_common/main.h" | 17 | #include "input_common/main.h" |
| @@ -79,13 +78,13 @@ EmuWindow_SDL2::EmuWindow_SDL2() { | |||
| 79 | SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8); | 78 | SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8); |
| 80 | SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 0); | 79 | SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 0); |
| 81 | 80 | ||
| 82 | std::string window_title = Common::StringFromFormat("Citra %s| %s-%s ", Common::g_build_name, | 81 | std::string window_title = Common::StringFromFormat("yuzu %s| %s-%s ", Common::g_build_name, |
| 83 | Common::g_scm_branch, Common::g_scm_desc); | 82 | Common::g_scm_branch, Common::g_scm_desc); |
| 84 | render_window = | 83 | render_window = |
| 85 | SDL_CreateWindow(window_title.c_str(), | 84 | SDL_CreateWindow(window_title.c_str(), |
| 86 | SDL_WINDOWPOS_UNDEFINED, // x position | 85 | SDL_WINDOWPOS_UNDEFINED, // x position |
| 87 | SDL_WINDOWPOS_UNDEFINED, // y position | 86 | SDL_WINDOWPOS_UNDEFINED, // y position |
| 88 | Core::kScreenTopWidth, Core::kScreenTopHeight + Core::kScreenBottomHeight, | 87 | Layout::ScreenUndocked::Width, Layout::ScreenUndocked::Height, |
| 89 | SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI); | 88 | SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI); |
| 90 | 89 | ||
| 91 | if (render_window == nullptr) { | 90 | if (render_window == nullptr) { |