Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-29 23:53:08 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #68630 from m4gr3d/fix_input_event_screen_drag_routing_3x

Browse Source 
[3.x] Fix routing of `InputEventScreenDrag` events to `Control` nodes
This commit is contained in:
Rémi Verschelde 2022-12-01 18:13:52 +01:00
commit af635f05bf
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
scene/main/viewport.cpp
View File

@ -2309,9 +2309,11 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
Ref<InputEventScreenTouch> touch_event = p_event; Ref<InputEventScreenTouch> touch_event = p_event;
if (touch_event.is_valid()) { if (touch_event.is_valid()) {
Size2 pos = touch_event->get_position(); Size2 pos = touch_event->get_position();
const int touch_index = touch_event->get_index();
if (touch_event->is_pressed()) { if (touch_event->is_pressed()) {
Control *over = _gui_find_control(pos); Control *over = _gui_find_control(pos);
if (over) { if (over) {
gui.touch_focus[touch_index] = over->get_instance_id();
if (!gui.modal_stack.empty()) { if (!gui.modal_stack.empty()) {
Control *top = gui.modal_stack.back()->get(); Control *top = gui.modal_stack.back()->get();
if (over != top && !top->is_a_parent_of(over)) { if (over != top && !top->is_a_parent_of(over)) {
@ -2331,14 +2333,22 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
set_input_as_handled(); set_input_as_handled();
return; return;
} }
} else if (touch_event->get_index() == 0 && gui.last_mouse_focus) { } else {
if (gui.last_mouse_focus->can_process()) { ObjectID control_id = gui.touch_focus[touch_index];
Control *over = Object::cast_to<Control>(ObjectDB::get_instance(control_id));
if (over && over->can_process()) {
touch_event = touch_event->xformed_by(Transform2D()); //make a copy touch_event = touch_event->xformed_by(Transform2D()); //make a copy
touch_event->set_position(gui.focus_inv_xform.xform(pos)); if (over == gui.last_mouse_focus) {
pos = gui.focus_inv_xform.xform(pos);
} else {
pos = over->get_global_transform_with_canvas().affine_inverse().xform(pos);
}
touch_event->set_position(pos);
_gui_call_input(gui.last_mouse_focus, touch_event); _gui_call_input(over, touch_event);
} }
set_input_as_handled(); set_input_as_handled();
gui.touch_focus.erase(touch_index);
return; return;
} }
} }
@ -2370,7 +2380,9 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
Ref<InputEventScreenDrag> drag_event = p_event; Ref<InputEventScreenDrag> drag_event = p_event;
if (drag_event.is_valid()) { if (drag_event.is_valid()) {
Control *over = gui.mouse_focus; const int drag_event_index = drag_event->get_index();
ObjectID control_id = gui.touch_focus[drag_event_index];
Control *over = Object::cast_to<Control>(ObjectDB::get_instance(control_id));
if (!over) { if (!over) {
over = _gui_find_control(drag_event->get_position()); over = _gui_find_control(drag_event->get_position());
} }

1
scene/main/viewport.h
View File

@ -296,6 +296,7 @@ private:
bool key_event_accepted; bool key_event_accepted;
bool mouse_in_window; bool mouse_in_window;
Map<int, ObjectID> touch_focus;
Control *mouse_focus; Control *mouse_focus;
Control *last_mouse_focus; Control *last_mouse_focus;
Control *mouse_click_grabber; Control *mouse_click_grabber;