diff options
author | german77 <juangerman-13@hotmail.com> | 2021-09-21 02:40:00 +0200 |
---|---|---|
committer | Narr the Reg <juangerman-13@hotmail.com> | 2021-11-25 03:30:23 +0100 |
commit | 14b949a0da6aa600d873c88f1836921f4d9a7919 (patch) | |
tree | fcfb83c157d459ec391699cc25f1d0b0b7dd2a11 /src/yuzu_cmd/emu_window/emu_window_sdl2.h | |
parent | yuzu: Use new input on main and bootmanager (diff) | |
download | yuzu-14b949a0da6aa600d873c88f1836921f4d9a7919.tar yuzu-14b949a0da6aa600d873c88f1836921f4d9a7919.tar.gz yuzu-14b949a0da6aa600d873c88f1836921f4d9a7919.tar.bz2 yuzu-14b949a0da6aa600d873c88f1836921f4d9a7919.tar.lz yuzu-14b949a0da6aa600d873c88f1836921f4d9a7919.tar.xz yuzu-14b949a0da6aa600d873c88f1836921f4d9a7919.tar.zst yuzu-14b949a0da6aa600d873c88f1836921f4d9a7919.zip |
Diffstat (limited to '')
-rw-r--r-- | src/yuzu_cmd/emu_window/emu_window_sdl2.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2.h b/src/yuzu_cmd/emu_window/emu_window_sdl2.h index 4810f8775..0af002693 100644 --- a/src/yuzu_cmd/emu_window/emu_window_sdl2.h +++ b/src/yuzu_cmd/emu_window/emu_window_sdl2.h @@ -16,11 +16,8 @@ class System; namespace InputCommon { class InputSubsystem; -} - -namespace MouseInput { enum class MouseButton; -} +} // namespace InputCommon class EmuWindow_SDL2 : public Core::Frontend::EmuWindow { public: @@ -47,7 +44,7 @@ protected: void OnMouseMotion(s32 x, s32 y); /// Converts a SDL mouse button into MouseInput mouse button - MouseInput::MouseButton SDLButtonToMouseButton(u32 button) const; + InputCommon::MouseButton SDLButtonToMouseButton(u32 button) const; /// Called by WaitEvent when a mouse button is pressed or released void OnMouseButton(u32 button, u8 state, s32 x, s32 y); @@ -56,10 +53,10 @@ protected: std::pair<unsigned, unsigned> TouchToPixelPos(float touch_x, float touch_y) const; /// Called by WaitEvent when a finger starts touching the touchscreen - void OnFingerDown(float x, float y); + void OnFingerDown(float x, float y, std::size_t id); /// Called by WaitEvent when a finger moves while touching the touchscreen - void OnFingerMotion(float x, float y); + void OnFingerMotion(float x, float y, std::size_t id); /// Called by WaitEvent when a finger stops touching the touchscreen void OnFingerUp(); |