summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDaniel Lundqvist <luda09yl@student.hj.se>2014-12-26 02:37:52 +0100
committerDaniel Lundqvist <luda09yl@student.hj.se>2014-12-26 02:37:52 +0100
commit9d90b26020af83d11ec0900117495901d445e907 (patch)
treeb45ed2ee33471deaf6d46fa9dee7aee785f1f83e /src
parentMerge pull request #328 from archshift/writeable (diff)
downloadyuzu-9d90b26020af83d11ec0900117495901d445e907.tar
yuzu-9d90b26020af83d11ec0900117495901d445e907.tar.gz
yuzu-9d90b26020af83d11ec0900117495901d445e907.tar.bz2
yuzu-9d90b26020af83d11ec0900117495901d445e907.tar.lz
yuzu-9d90b26020af83d11ec0900117495901d445e907.tar.xz
yuzu-9d90b26020af83d11ec0900117495901d445e907.tar.zst
yuzu-9d90b26020af83d11ec0900117495901d445e907.zip
Diffstat (limited to 'src')
-rw-r--r--src/citra_qt/bootmanager.cpp3
-rw-r--r--src/citra_qt/main.cpp1
2 files changed, 4 insertions, 0 deletions
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp
index 6d08d6afc..d44ddb096 100644
--- a/src/citra_qt/bootmanager.cpp
+++ b/src/citra_qt/bootmanager.cpp
@@ -123,6 +123,9 @@ GRenderWindow::GRenderWindow(QWidget* parent) : QWidget(parent), emu_thread(this
std::string window_title = Common::StringFromFormat("Citra | %s-%s", Common::g_scm_branch, Common::g_scm_desc);
setWindowTitle(QString::fromStdString(window_title));
+ // Allow manually setting focus to the widget.
+ setFocusPolicy(Qt::ClickFocus);
+
keyboard_id = KeyMap::NewDeviceId();
ReloadSetKeymaps();
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index 23d4925b8..9fc8705e6 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -170,6 +170,7 @@ void GMainWindow::BootGame(std::string filename)
render_window->GetEmuThread().start();
render_window->show();
+ render_window->setFocus();
OnStartGame();
}