From b4ee710b6f547e7b374f473b95ef7de9f0f88817 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Mon, 19 Dec 2011 20:46:46 -0800 Subject: [PATCH] Prevent mouse from leaving screen when moved via touch events. --- guacamole-common-js/src/main/resources/mouse.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/guacamole-common-js/src/main/resources/mouse.js b/guacamole-common-js/src/main/resources/mouse.js index 6f1edf0c5..9c6537c15 100644 --- a/guacamole-common-js/src/main/resources/mouse.js +++ b/guacamole-common-js/src/main/resources/mouse.js @@ -247,7 +247,17 @@ Guacamole.Mouse = function(element) { guac_mouse.currentState.x += delta_x; guac_mouse.currentState.y += delta_y; - // FIXME: Prevent mouse from leaving screen + // Prevent mouse from leaving screen + + if (guac_mouse.currentState.x < 0) + guac_mouse.currentState.x = 0; + else if (guac_mouse.currentState.x >= element.offsetWidth) + guac_mouse.currentState.x = element.offsetWidth - 1; + + if (guac_mouse.currentState.y < 0) + guac_mouse.currentState.y = 0; + else if (guac_mouse.currentState.y >= element.offsetHeight) + guac_mouse.currentState.y = element.offsetHeight - 1; // Fire movement event, if defined if (guac_mouse.onmousemove)