diff options
| author | 2014-12-26 02:37:52 +0100 | |
|---|---|---|
| committer | 2014-12-26 02:37:52 +0100 | |
| commit | 9d90b26020af83d11ec0900117495901d445e907 (patch) | |
| tree | b45ed2ee33471deaf6d46fa9dee7aee785f1f83e /src | |
| parent | Merge pull request #328 from archshift/writeable (diff) | |
| download | yuzu-9d90b26020af83d11ec0900117495901d445e907.tar.gz yuzu-9d90b26020af83d11ec0900117495901d445e907.tar.xz yuzu-9d90b26020af83d11ec0900117495901d445e907.zip | |
Allow focus on the Qt render widget
By default widgets are set to the focus policy Qt::NoFocus which disallows manually focusing it. Changing the policy to allow clicking the widget to set focus to it allows for keyboard input when not rendering to a popout window. This commit also sets focus to the widget when showing it.
Fixes issue #158.
Diffstat (limited to 'src')
| -rw-r--r-- | src/citra_qt/bootmanager.cpp | 3 | ||||
| -rw-r--r-- | src/citra_qt/main.cpp | 1 |
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 | |||
| 123 | std::string window_title = Common::StringFromFormat("Citra | %s-%s", Common::g_scm_branch, Common::g_scm_desc); | 123 | std::string window_title = Common::StringFromFormat("Citra | %s-%s", Common::g_scm_branch, Common::g_scm_desc); |
| 124 | setWindowTitle(QString::fromStdString(window_title)); | 124 | setWindowTitle(QString::fromStdString(window_title)); |
| 125 | 125 | ||
| 126 | // Allow manually setting focus to the widget. | ||
| 127 | setFocusPolicy(Qt::ClickFocus); | ||
| 128 | |||
| 126 | keyboard_id = KeyMap::NewDeviceId(); | 129 | keyboard_id = KeyMap::NewDeviceId(); |
| 127 | ReloadSetKeymaps(); | 130 | ReloadSetKeymaps(); |
| 128 | 131 | ||
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) | |||
| 170 | render_window->GetEmuThread().start(); | 170 | render_window->GetEmuThread().start(); |
| 171 | 171 | ||
| 172 | render_window->show(); | 172 | render_window->show(); |
| 173 | render_window->setFocus(); | ||
| 173 | OnStartGame(); | 174 | OnStartGame(); |
| 174 | } | 175 | } |
| 175 | 176 | ||