diff options
| author | bunnei <bunneidev@gmail.com> | 2017-03-20 11:13:52 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-20 11:13:52 -0400 |
| commit | a48e5c64b65c99aea859f5941028f42b117fb8e4 (patch) | |
| tree | b23a5f598b6a0a4b7346e2be7839f2cd4b5de2a5 | |
| parent | 2f625f2c6f2e50cad67fd6644d3fd11d0458920b (diff) | |
| parent | 560884336f706846545cd4c3243002ccb03cfe6d (diff) | |
Merge pull request #2630 from wwylele/qt-focus-loss-2
Qt: Release all pressed buttons when window focus is lost [rebased]
| -rw-r--r-- | src/citra_qt/bootmanager.cpp | 5 | ||||
| -rw-r--r-- | src/citra_qt/bootmanager.h | 2 | ||||
| -rw-r--r-- | src/citra_qt/main.cpp | 1 | ||||
| -rw-r--r-- | src/input_common/keyboard.cpp | 11 | ||||
| -rw-r--r-- | src/input_common/keyboard.h | 2 |
5 files changed, 18 insertions, 3 deletions
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index 28264df9a8..bae576d6ab 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp @@ -235,7 +235,10 @@ void GRenderWindow::mouseReleaseEvent(QMouseEvent* event) { motion_emu->EndTilt(); } -void GRenderWindow::ReloadSetKeymaps() {} +void GRenderWindow::focusOutEvent(QFocusEvent* event) { + QWidget::focusOutEvent(event); + InputCommon::GetKeyboard()->ReleaseAllKeys(); +} void GRenderWindow::OnClientAreaResized(unsigned width, unsigned height) { NotifyClientAreaSizeChanged(std::make_pair(width, height)); diff --git a/src/citra_qt/bootmanager.h b/src/citra_qt/bootmanager.h index 923a5b4569..9d39f1af8f 100644 --- a/src/citra_qt/bootmanager.h +++ b/src/citra_qt/bootmanager.h @@ -128,7 +128,7 @@ public: void mouseMoveEvent(QMouseEvent* event) override; void mouseReleaseEvent(QMouseEvent* event) override; - void ReloadSetKeymaps(); + void focusOutEvent(QFocusEvent* event) override; void OnClientAreaResized(unsigned width, unsigned height); diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index fd51659b90..2723a02170 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp @@ -612,7 +612,6 @@ void GMainWindow::OnConfigure() { auto result = configureDialog.exec(); if (result == QDialog::Accepted) { configureDialog.applyConfiguration(); - render_window->ReloadSetKeymaps(); config->Save(); } } diff --git a/src/input_common/keyboard.cpp b/src/input_common/keyboard.cpp index a8fc01f2e9..0f0d10f237 100644 --- a/src/input_common/keyboard.cpp +++ b/src/input_common/keyboard.cpp @@ -53,6 +53,13 @@ public: } } + void ChangeAllKeyStatus(bool pressed) { + std::lock_guard<std::mutex> guard(mutex); + for (const KeyButtonPair& pair : list) { + pair.key_button->status.store(pressed); + } + } + private: std::mutex mutex; std::list<KeyButtonPair> list; @@ -79,4 +86,8 @@ void Keyboard::ReleaseKey(int key_code) { key_button_list->ChangeKeyStatus(key_code, false); } +void Keyboard::ReleaseAllKeys() { + key_button_list->ChangeAllKeyStatus(false); +} + } // namespace InputCommon diff --git a/src/input_common/keyboard.h b/src/input_common/keyboard.h index 76359aa305..8619504729 100644 --- a/src/input_common/keyboard.h +++ b/src/input_common/keyboard.h @@ -38,6 +38,8 @@ public: */ void ReleaseKey(int key_code); + void ReleaseAllKeys(); + private: std::shared_ptr<KeyButtonList> key_button_list; }; |