diff options
Diffstat (limited to 'src/citra/emu_window/emu_window_sdl2.cpp')
| -rw-r--r-- | src/citra/emu_window/emu_window_sdl2.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/citra/emu_window/emu_window_sdl2.cpp b/src/citra/emu_window/emu_window_sdl2.cpp index 6bc0b0d00..47aadd60c 100644 --- a/src/citra/emu_window/emu_window_sdl2.cpp +++ b/src/citra/emu_window/emu_window_sdl2.cpp | |||
| @@ -12,10 +12,10 @@ | |||
| 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" | ||
| 15 | #include "core/settings.h" | 16 | #include "core/settings.h" |
| 16 | #include "input_common/keyboard.h" | 17 | #include "input_common/keyboard.h" |
| 17 | #include "input_common/main.h" | 18 | #include "input_common/main.h" |
| 18 | #include "video_core/video_core.h" | ||
| 19 | 19 | ||
| 20 | void EmuWindow_SDL2::OnMouseMotion(s32 x, s32 y) { | 20 | void EmuWindow_SDL2::OnMouseMotion(s32 x, s32 y) { |
| 21 | TouchMoved((unsigned)std::max(x, 0), (unsigned)std::max(y, 0)); | 21 | TouchMoved((unsigned)std::max(x, 0), (unsigned)std::max(y, 0)); |
| @@ -80,12 +80,12 @@ EmuWindow_SDL2::EmuWindow_SDL2() { | |||
| 80 | 80 | ||
| 81 | std::string window_title = Common::StringFromFormat("Citra %s| %s-%s ", Common::g_build_name, | 81 | std::string window_title = Common::StringFromFormat("Citra %s| %s-%s ", Common::g_build_name, |
| 82 | Common::g_scm_branch, Common::g_scm_desc); | 82 | Common::g_scm_branch, Common::g_scm_desc); |
| 83 | render_window = SDL_CreateWindow( | 83 | render_window = |
| 84 | window_title.c_str(), | 84 | SDL_CreateWindow(window_title.c_str(), |
| 85 | SDL_WINDOWPOS_UNDEFINED, // x position | 85 | SDL_WINDOWPOS_UNDEFINED, // x position |
| 86 | SDL_WINDOWPOS_UNDEFINED, // y position | 86 | SDL_WINDOWPOS_UNDEFINED, // y position |
| 87 | VideoCore::kScreenTopWidth, VideoCore::kScreenTopHeight + VideoCore::kScreenBottomHeight, | 87 | Core::kScreenTopWidth, Core::kScreenTopHeight + Core::kScreenBottomHeight, |
| 88 | SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI); | 88 | SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI); |
| 89 | 89 | ||
| 90 | if (render_window == nullptr) { | 90 | if (render_window == nullptr) { |
| 91 | LOG_CRITICAL(Frontend, "Failed to create SDL2 window! Exiting..."); | 91 | LOG_CRITICAL(Frontend, "Failed to create SDL2 window! Exiting..."); |