summaryrefslogtreecommitdiff
path: root/src/citra_qt/bootmanager.cpp
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner2017-05-28 01:01:00 -0700
committerGravatar GitHub2017-05-28 01:01:00 -0700
commit4caa2bad9d57c97aa749d3a44f6be6f593bb798b (patch)
treeba001a9832ee8965963d17fd4e93e9222e1153de /src/citra_qt/bootmanager.cpp
parentMerge pull request #2732 from yuriks/add-fmt (diff)
parentCMake: Correct inter-module dependencies and library visibility (diff)
downloadyuzu-4caa2bad9d57c97aa749d3a44f6be6f593bb798b.tar.gz
yuzu-4caa2bad9d57c97aa749d3a44f6be6f593bb798b.tar.xz
yuzu-4caa2bad9d57c97aa749d3a44f6be6f593bb798b.zip
Merge pull request #2733 from yuriks/cmake-cleanup
Dependencies and build system cleanup
Diffstat (limited to 'src/citra_qt/bootmanager.cpp')
-rw-r--r--src/citra_qt/bootmanager.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp
index bae576d6a..06b62f44c 100644
--- a/src/citra_qt/bootmanager.cpp
+++ b/src/citra_qt/bootmanager.cpp
@@ -12,12 +12,11 @@
12#include "common/microprofile.h" 12#include "common/microprofile.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/core.h" 16#include "core/core.h"
16#include "core/settings.h" 17#include "core/settings.h"
17#include "input_common/keyboard.h" 18#include "input_common/keyboard.h"
18#include "input_common/main.h" 19#include "input_common/main.h"
19#include "video_core/debug_utils/debug_utils.h"
20#include "video_core/video_core.h"
21 20
22EmuThread::EmuThread(GRenderWindow* render_window) 21EmuThread::EmuThread(GRenderWindow* render_window)
23 : exec_step(false), running(false), stop_run(false), render_window(render_window) {} 22 : exec_step(false), running(false), stop_run(false), render_window(render_window) {}
@@ -266,8 +265,7 @@ void GRenderWindow::InitRenderTarget() {
266 child = new GGLWidgetInternal(fmt, this); 265 child = new GGLWidgetInternal(fmt, this);
267 QBoxLayout* layout = new QHBoxLayout(this); 266 QBoxLayout* layout = new QHBoxLayout(this);
268 267
269 resize(VideoCore::kScreenTopWidth, 268 resize(Core::kScreenTopWidth, Core::kScreenTopHeight + Core::kScreenBottomHeight);
270 VideoCore::kScreenTopHeight + VideoCore::kScreenBottomHeight);
271 layout->addWidget(child); 269 layout->addWidget(child);
272 layout->setMargin(0); 270 layout->setMargin(0);
273 setLayout(layout); 271 setLayout(layout);