summaryrefslogtreecommitdiff
path: root/src/common/emu_window.h
diff options
context:
space:
mode:
authorGravatar Zaneo2015-04-14 00:06:44 -0400
committerGravatar Zaneo2015-05-01 23:52:33 -0400
commitb8328593fe3d60ecb066ad0959d8c1e8dfb4d3c5 (patch)
treefdeec9f5d356b84f21c92ddb4b469aedb11e93db /src/common/emu_window.h
parentMerge pull request #715 from purpasmart96/configmem_typo_fix (diff)
downloadyuzu-b8328593fe3d60ecb066ad0959d8c1e8dfb4d3c5.tar.gz
yuzu-b8328593fe3d60ecb066ad0959d8c1e8dfb4d3c5.tar.xz
yuzu-b8328593fe3d60ecb066ad0959d8c1e8dfb4d3c5.zip
EmuWindow: Clip mouse input coordinates to emulated screen dimensions.
If the mouse position for a mouse move/drag would take it outside the emulated screen dimensions, clip the coordinates to the emulated screen dimensions. Qt and GLFW will report negative coordinates for mouse positions to the left, or above citra window. Added restriction to mouse coordinates passed to touchmoved by Qt/GLFW to be greater or equal to zero.
Diffstat (limited to 'src/common/emu_window.h')
-rw-r--r--src/common/emu_window.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/common/emu_window.h b/src/common/emu_window.h
index c8e2de04a..e0fc12a48 100644
--- a/src/common/emu_window.h
+++ b/src/common/emu_window.h
@@ -206,5 +206,10 @@ private:
206 u16 touch_x; ///< Touchpad X-position in native 3DS pixel coordinates (0-320) 206 u16 touch_x; ///< Touchpad X-position in native 3DS pixel coordinates (0-320)
207 u16 touch_y; ///< Touchpad Y-position in native 3DS pixel coordinates (0-240) 207 u16 touch_y; ///< Touchpad Y-position in native 3DS pixel coordinates (0-240)
208 208
209 /**
210 * Clip the provided coordinates to be inside the touchscreen area.
211 */
212 std::tuple<unsigned,unsigned> ClipToTouchScreen(unsigned new_x, unsigned new_y);
213
209 Service::HID::PadState pad_state; 214 Service::HID::PadState pad_state;
210}; 215};