diff options
author | german <german@thesoftwareartisans.com> | 2021-01-01 19:32:29 +0100 |
---|---|---|
committer | german <german@thesoftwareartisans.com> | 2021-01-15 16:05:17 +0100 |
commit | d8df9a16bd4f4517b024c17446a94915493d7f3d (patch) | |
tree | aed2de583aa94dd11259bece37e55f4263f07336 /src/core/frontend/emu_window.cpp | |
parent | Allow all touch inputs at the same time and remove config options that are not longer necesary (diff) | |
download | yuzu-d8df9a16bd4f4517b024c17446a94915493d7f3d.tar yuzu-d8df9a16bd4f4517b024c17446a94915493d7f3d.tar.gz yuzu-d8df9a16bd4f4517b024c17446a94915493d7f3d.tar.bz2 yuzu-d8df9a16bd4f4517b024c17446a94915493d7f3d.tar.lz yuzu-d8df9a16bd4f4517b024c17446a94915493d7f3d.tar.xz yuzu-d8df9a16bd4f4517b024c17446a94915493d7f3d.tar.zst yuzu-d8df9a16bd4f4517b024c17446a94915493d7f3d.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/frontend/emu_window.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/core/frontend/emu_window.cpp b/src/core/frontend/emu_window.cpp index 8c1193894..589842917 100644 --- a/src/core/frontend/emu_window.cpp +++ b/src/core/frontend/emu_window.cpp @@ -30,12 +30,14 @@ private: class Device : public Input::TouchDevice { public: explicit Device(std::weak_ptr<TouchState>&& touch_state) : touch_state(touch_state) {} - std::tuple<float, float, bool> GetStatus() const override { + Input::TouchStatus GetStatus() const override { + Input::TouchStatus touch_status = {}; if (auto state = touch_state.lock()) { std::lock_guard guard{state->mutex}; - return std::make_tuple(state->touch_x, state->touch_y, state->touch_pressed); + touch_status[0] = + std::make_tuple(state->touch_x, state->touch_y, state->touch_pressed); } - return std::make_tuple(0.0f, 0.0f, false); + return touch_status; } private: |