diff options
| author | bunnei <bunneidev@gmail.com> | 2018-01-10 04:36:07 +0100 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2018-01-11 05:28:43 +0100 |
| commit | 482cf8a005a3c13ac7239995fdbe2e78d12984b9 (patch) | |
| tree | 0e29fe56ada3a97a1f753ad68e1430e98f66e303 /src/citra | |
| parent | NV: Move the nv device nodes to their own directory and namespace. (diff) | |
| download | yuzu-482cf8a005a3c13ac7239995fdbe2e78d12984b9.tar yuzu-482cf8a005a3c13ac7239995fdbe2e78d12984b9.tar.gz yuzu-482cf8a005a3c13ac7239995fdbe2e78d12984b9.tar.bz2 yuzu-482cf8a005a3c13ac7239995fdbe2e78d12984b9.tar.lz yuzu-482cf8a005a3c13ac7239995fdbe2e78d12984b9.tar.xz yuzu-482cf8a005a3c13ac7239995fdbe2e78d12984b9.tar.zst yuzu-482cf8a005a3c13ac7239995fdbe2e78d12984b9.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/citra/emu_window/emu_window_sdl2.cpp | 5 | ||||
| -rw-r--r-- | src/citra_qt/bootmanager.cpp | 4 |
2 files changed, 4 insertions, 5 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 @@ #include "common/logging/log.h" #include "common/scm_rev.h" #include "common/string_util.h" -#include "core/3ds.h" #include "core/settings.h" #include "input_common/keyboard.h" #include "input_common/main.h" @@ -79,13 +78,13 @@ EmuWindow_SDL2::EmuWindow_SDL2() { SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8); SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 0); - std::string window_title = Common::StringFromFormat("Citra %s| %s-%s ", Common::g_build_name, + std::string window_title = Common::StringFromFormat("yuzu %s| %s-%s ", Common::g_build_name, Common::g_scm_branch, Common::g_scm_desc); render_window = SDL_CreateWindow(window_title.c_str(), SDL_WINDOWPOS_UNDEFINED, // x position SDL_WINDOWPOS_UNDEFINED, // y position - Core::kScreenTopWidth, Core::kScreenTopHeight + Core::kScreenBottomHeight, + Layout::ScreenUndocked::Width, Layout::ScreenUndocked::Height, SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI); if (render_window == nullptr) { diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index 7107bfc60..eb542ad4e 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp @@ -12,8 +12,8 @@ #include "common/microprofile.h" #include "common/scm_rev.h" #include "common/string_util.h" -#include "core/3ds.h" #include "core/core.h" +#include "core/frontend/framebuffer_layout.h" #include "core/settings.h" #include "input_common/keyboard.h" #include "input_common/main.h" @@ -271,7 +271,7 @@ void GRenderWindow::InitRenderTarget() { child = new GGLWidgetInternal(fmt, this); QBoxLayout* layout = new QHBoxLayout(this); - resize(Core::kScreenTopWidth, Core::kScreenTopHeight + Core::kScreenBottomHeight); + resize(Layout::ScreenUndocked::Width, Layout::ScreenUndocked::Height); layout->addWidget(child); layout->setMargin(0); setLayout(layout); |