diff options
| author |  Tony Wasserka | 2015-05-02 19:15:03 +0200 |
|---|---|---|
| committer | Tony Wasserka | 2015-05-02 19:15:03 +0200 |
| commit | 7859b145cf11aaed39fc430ab1cf277a0cc39e77 (patch) | |
| tree | 66b4622566d00fe5788dc8ce7dbfc899d9c056d6 /src/citra/emu_window/emu_window_glfw.cpp | |
| parent | Merge pull request #713 from bunnei/qt-emuthread-fixes (diff) | |
| parent | EmuWindow: Clip mouse input coordinates to emulated screen dimensions. (diff) | |
| download | yuzu-7859b145cf11aaed39fc430ab1cf277a0cc39e77.tar.gz yuzu-7859b145cf11aaed39fc430ab1cf277a0cc39e77.tar.xz yuzu-7859b145cf11aaed39fc430ab1cf277a0cc39e77.zip | |
Merge pull request #698 from Zaneo/clip_stylus_input
EmuWindow: Clip mouse input coordinates to emulated screen dimensions.
Diffstat (limited to 'src/citra/emu_window/emu_window_glfw.cpp')
| -rw-r--r-- | src/citra/emu_window/emu_window_glfw.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/citra/emu_window/emu_window_glfw.cpp b/src/citra/emu_window/emu_window_glfw.cpp index 997e3bc7d..f879ee7ca 100644 --- a/src/citra/emu_window/emu_window_glfw.cpp +++ b/src/citra/emu_window/emu_window_glfw.cpp | |||
| @@ -31,7 +31,7 @@ void EmuWindow_GLFW::OnMouseButtonEvent(GLFWwindow* win, int button, int action, | |||
| 31 | } | 31 | } |
| 32 | 32 | ||
| 33 | void EmuWindow_GLFW::OnCursorPosEvent(GLFWwindow* win, double x, double y) { | 33 | void EmuWindow_GLFW::OnCursorPosEvent(GLFWwindow* win, double x, double y) { |
| 34 | GetEmuWindow(win)->TouchMoved(static_cast<unsigned>(x), static_cast<unsigned>(y)); | 34 | GetEmuWindow(win)->TouchMoved(static_cast<unsigned>(std::max(x, 0.0)), static_cast<unsigned>(std::max(y, 0.0))); |
| 35 | } | 35 | } |
| 36 | 36 | ||
| 37 | /// Called by GLFW when a key event occurs | 37 | /// Called by GLFW when a key event occurs |