summaryrefslogtreecommitdiffstats
path: root/src/yuzu_cmd/emu_window
diff options
context:
space:
mode:
authorgerman <german@thesoftwareartisans.com>2021-01-03 05:04:50 +0100
committergerman <german@thesoftwareartisans.com>2021-01-15 16:05:17 +0100
commit8495e1bd8373fed993975e40c360c87409455e9e (patch)
treefffff1304673212280dc0e927b69efa3ca4fc8b3 /src/yuzu_cmd/emu_window
parentAllow to return up to 16 touch inputs per engine (diff)
downloadyuzu-8495e1bd8373fed993975e40c360c87409455e9e.tar
yuzu-8495e1bd8373fed993975e40c360c87409455e9e.tar.gz
yuzu-8495e1bd8373fed993975e40c360c87409455e9e.tar.bz2
yuzu-8495e1bd8373fed993975e40c360c87409455e9e.tar.lz
yuzu-8495e1bd8373fed993975e40c360c87409455e9e.tar.xz
yuzu-8495e1bd8373fed993975e40c360c87409455e9e.tar.zst
yuzu-8495e1bd8373fed993975e40c360c87409455e9e.zip
Diffstat (limited to 'src/yuzu_cmd/emu_window')
-rw-r--r--src/yuzu_cmd/emu_window/emu_window_sdl2.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp
index e32bed5e6..7843d5167 100644
--- a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp
+++ b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp
@@ -29,16 +29,16 @@ EmuWindow_SDL2::~EmuWindow_SDL2() {
}
void EmuWindow_SDL2::OnMouseMotion(s32 x, s32 y) {
- TouchMoved((unsigned)std::max(x, 0), (unsigned)std::max(y, 0));
+ TouchMoved((unsigned)std::max(x, 0), (unsigned)std::max(y, 0), 0);
input_subsystem->GetMouse()->MouseMove(x, y);
}
void EmuWindow_SDL2::OnMouseButton(u32 button, u8 state, s32 x, s32 y) {
if (button == SDL_BUTTON_LEFT) {
if (state == SDL_PRESSED) {
- TouchPressed((unsigned)std::max(x, 0), (unsigned)std::max(y, 0));
+ TouchPressed((unsigned)std::max(x, 0), (unsigned)std::max(y, 0), 0);
} else {
- TouchReleased();
+ TouchReleased(0);
}
} else if (button == SDL_BUTTON_RIGHT) {
if (state == SDL_PRESSED) {
@@ -66,16 +66,16 @@ void EmuWindow_SDL2::OnFingerDown(float x, float y) {
// 3DS does
const auto [px, py] = TouchToPixelPos(x, y);
- TouchPressed(px, py);
+ TouchPressed(px, py, 0);
}
void EmuWindow_SDL2::OnFingerMotion(float x, float y) {
const auto [px, py] = TouchToPixelPos(x, y);
- TouchMoved(px, py);
+ TouchMoved(px, py, 0);
}
void EmuWindow_SDL2::OnFingerUp() {
- TouchReleased();
+ TouchReleased(0);
}
void EmuWindow_SDL2::OnKeyEvent(int key, u8 state) {