summaryrefslogtreecommitdiffstats
path: root/src/citra/emu_window
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2015-03-09 05:14:59 +0100
committerbunnei <bunneidev@gmail.com>2015-03-11 04:58:07 +0100
commitd61b26b79f889603a084e148626bba3c267cf75f (patch)
treed793edd22e25a99aa5c13cc2455a5ec2167afee7 /src/citra/emu_window
parentEmuWindow: Made pad/touch functions non-static. (diff)
downloadyuzu-d61b26b79f889603a084e148626bba3c267cf75f.tar
yuzu-d61b26b79f889603a084e148626bba3c267cf75f.tar.gz
yuzu-d61b26b79f889603a084e148626bba3c267cf75f.tar.bz2
yuzu-d61b26b79f889603a084e148626bba3c267cf75f.tar.lz
yuzu-d61b26b79f889603a084e148626bba3c267cf75f.tar.xz
yuzu-d61b26b79f889603a084e148626bba3c267cf75f.tar.zst
yuzu-d61b26b79f889603a084e148626bba3c267cf75f.zip
Diffstat (limited to 'src/citra/emu_window')
-rw-r--r--src/citra/emu_window/emu_window_glfw.cpp17
1 files changed, 6 insertions, 11 deletions
diff --git a/src/citra/emu_window/emu_window_glfw.cpp b/src/citra/emu_window/emu_window_glfw.cpp
index 3e58d6663..997e3bc7d 100644
--- a/src/citra/emu_window/emu_window_glfw.cpp
+++ b/src/citra/emu_window/emu_window_glfw.cpp
@@ -23,18 +23,15 @@ void EmuWindow_GLFW::OnMouseButtonEvent(GLFWwindow* win, int button, int action,
double x, y;
glfwGetCursorPos(win, &x, &y);
- if (action == GLFW_PRESS) {
- emu_window->TouchPressed(layout, static_cast<u16>(x), static_cast<u16>(y));
- } else if (action == GLFW_RELEASE) {
- emu_window->TouchReleased(layout, static_cast<u16>(x), static_cast<u16>(y));
- }
+ if (action == GLFW_PRESS)
+ emu_window->TouchPressed(static_cast<unsigned>(x), static_cast<unsigned>(y));
+ else if (action == GLFW_RELEASE)
+ emu_window->TouchReleased();
}
}
void EmuWindow_GLFW::OnCursorPosEvent(GLFWwindow* win, double x, double y) {
- auto emu_window = GetEmuWindow(win);
- auto layout = emu_window->GetFramebufferLayout();
- emu_window->TouchMoved(layout, static_cast<u16>(x), static_cast<u16>(y));
+ GetEmuWindow(win)->TouchMoved(static_cast<unsigned>(x), static_cast<unsigned>(y));
}
/// Called by GLFW when a key event occurs
@@ -45,10 +42,8 @@ void EmuWindow_GLFW::OnKeyEvent(GLFWwindow* win, int key, int scancode, int acti
if (action == GLFW_PRESS) {
emu_window->KeyPressed({key, keyboard_id});
} else if (action == GLFW_RELEASE) {
- emu_window->KeyReleased({ key, keyboard_id });
+ emu_window->KeyReleased({key, keyboard_id});
}
-
- Service::HID::PadUpdateComplete();
}
/// Whether the window is still open, and a close request hasn't yet been sent