godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix mouse button state in HTML5 platform 

Regression from 844c5e12e6
This commit is contained in:
Leon Krause 2017-09-19 19:15:51 +02:00
parent d58b0a5c9a
commit d1ecc25db4
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
platform/javascript/os_javascript.cpp
View File

@ -172,14 +172,14 @@ static EM_BOOL _mousebutton_callback(int event_type, const EmscriptenMouseEvent
if (!is_canvas_focused()) { if (!is_canvas_focused()) {
focus_canvas(); focus_canvas();
} }
mask |= 1 << ev->get_button_index(); mask |= ev->get_button_index();
} else if (mask & (1 << ev->get_button_index())) { } else if (mask & ev->get_button_index()) {
mask &= ~(1 << ev->get_button_index()); mask &= ~ev->get_button_index();
} else { } else {
// release event, but press was outside the canvas, so ignore // release event, but press was outside the canvas, so ignore
return false; return false;
} }
ev->set_button_mask(mask >> 1); ev->set_button_mask(mask);
_input->parse_input_event(ev); _input->parse_input_event(ev);
// prevent selection dragging // prevent selection dragging
@ -200,7 +200,7 @@ static EM_BOOL _mousemove_callback(int event_type, const EmscriptenMouseEvent *m
Ref<InputEventMouseMotion> ev; Ref<InputEventMouseMotion> ev;
ev.instance(); ev.instance();
dom2godot_mod(mouse_event, ev); dom2godot_mod(mouse_event, ev);
ev->set_button_mask(input_mask >> 1); ev->set_button_mask(input_mask);
ev->set_position(pos); ev->set_position(pos);
ev->set_global_position(ev->get_position()); ev->set_global_position(ev->get_position());
@ -227,7 +227,7 @@ static EM_BOOL _wheel_callback(int event_type, const EmscriptenWheelEvent *wheel
Ref<InputEventMouseButton> ev; Ref<InputEventMouseButton> ev;
ev.instance(); ev.instance();
ev->set_button_mask(_input->get_mouse_button_mask() >> 1); ev->set_button_mask(_input->get_mouse_button_mask());
ev->set_position(_input->get_mouse_position()); ev->set_position(_input->get_mouse_position());
ev->set_global_position(ev->get_position()); ev->set_global_position(ev->get_position());
@ -291,7 +291,7 @@ static EM_BOOL _touchpress_callback(int event_type, const EmscriptenTouchEvent *
Ref<InputEventMouseButton> ev_mouse; Ref<InputEventMouseButton> ev_mouse;
ev_mouse.instance(); ev_mouse.instance();
ev_mouse->set_button_mask(_input->get_mouse_button_mask() >> 1); ev_mouse->set_button_mask(_input->get_mouse_button_mask());
dom2godot_mod(touch_event, ev_mouse); dom2godot_mod(touch_event, ev_mouse);
const EmscriptenTouchPoint &first_touch = touch_event->touches[lowest_id_index]; const EmscriptenTouchPoint &first_touch = touch_event->touches[lowest_id_index];
@ -334,7 +334,7 @@ static EM_BOOL _touchmove_callback(int event_type, const EmscriptenTouchEvent *t
Ref<InputEventMouseMotion> ev_mouse; Ref<InputEventMouseMotion> ev_mouse;
ev_mouse.instance(); ev_mouse.instance();
dom2godot_mod(touch_event, ev_mouse); dom2godot_mod(touch_event, ev_mouse);
ev_mouse->set_button_mask(_input->get_mouse_button_mask() >> 1); ev_mouse->set_button_mask(_input->get_mouse_button_mask());
const EmscriptenTouchPoint &first_touch = touch_event->touches[lowest_id_index]; const EmscriptenTouchPoint &first_touch = touch_event->touches[lowest_id_index];
ev_mouse->set_position(Point2(first_touch.canvasX, first_touch.canvasY)); ev_mouse->set_position(Point2(first_touch.canvasX, first_touch.canvasY));