INSANEMODE/yuzu-android
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-android.git synced 2025-07-04 16:47:51 -05:00
Code Issues Packages Projects Releases Wiki Activity

yuzu_cmd: Use new input

Browse Source
This commit is contained in:
german77
2021-09-20 19:40:00 -05:00
committed by Narr the Reg
parent 737d305f63
commit 14b949a0da
3 changed files with 39 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/yuzu_cmd/emu_window/emu_window_sdl2.h
View File

@ -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();