diff options
Diffstat (limited to '')
| -rw-r--r-- | src/core/frontend/emu_window.cpp | 5 | ||||
| -rw-r--r-- | src/core/frontend/emu_window.h | 9 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/core/frontend/emu_window.cpp b/src/core/frontend/emu_window.cpp index af6c1633a..ee7a58b1c 100644 --- a/src/core/frontend/emu_window.cpp +++ b/src/core/frontend/emu_window.cpp @@ -28,12 +28,11 @@ private: public: explicit Device(std::weak_ptr<TouchState>&& touch_state) : touch_state(touch_state) {} Input::TouchStatus GetStatus() const override { - Input::TouchStatus touch_status{}; if (auto state = touch_state.lock()) { std::lock_guard guard{state->mutex}; - touch_status = state->status; + return state->status; } - return touch_status; + return {}; } private: diff --git a/src/core/frontend/emu_window.h b/src/core/frontend/emu_window.h index f8db42ab4..2436c6580 100644 --- a/src/core/frontend/emu_window.h +++ b/src/core/frontend/emu_window.h @@ -117,12 +117,13 @@ public: * Signal that a touch pressed event has occurred (e.g. mouse click pressed) * @param framebuffer_x Framebuffer x-coordinate that was pressed * @param framebuffer_y Framebuffer y-coordinate that was pressed - * @param id Touch event id + * @param id Touch event ID */ void TouchPressed(unsigned framebuffer_x, unsigned framebuffer_y, std::size_t id); - /** Signal that a touch released event has occurred (e.g. mouse click released) - *@param id Touch event id + /** + * Signal that a touch released event has occurred (e.g. mouse click released) + * @param id Touch event ID */ void TouchReleased(std::size_t id); @@ -130,7 +131,7 @@ public: * Signal that a touch movement event has occurred (e.g. mouse was moved over the emu window) * @param framebuffer_x Framebuffer x-coordinate * @param framebuffer_y Framebuffer y-coordinate - * @param id Touch event id + * @param id Touch event ID */ void TouchMoved(unsigned framebuffer_x, unsigned framebuffer_y, std::size_t id); |