Skip to content

Commit 98a2313

Browse files
committed
Fix missing event metadata in _input() with Input.parse_input_event()
Use merge_meta_from() for metadata copying. Fixed include order Removed unnecessary line
1 parent 1f47e4c commit 98a2313

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

core/input/input_event.cpp

+12
Original file line numberDiff line numberDiff line change
@@ -754,6 +754,8 @@ Ref<InputEvent> InputEventMouseButton::xformed_by(const Transform2D &p_xform, co
754754
mb->set_factor(factor);
755755
mb->set_button_index(button_index);
756756

757+
mb->merge_meta_from(this);
758+
757759
return mb;
758760
}
759761

@@ -974,6 +976,8 @@ Ref<InputEvent> InputEventMouseMotion::xformed_by(const Transform2D &p_xform, co
974976
mm->set_velocity(p_xform.basis_xform(get_velocity()));
975977
mm->set_screen_velocity(get_screen_velocity());
976978

979+
mm->merge_meta_from(this);
980+
977981
return mm;
978982
}
979983

@@ -1366,6 +1370,8 @@ Ref<InputEvent> InputEventScreenTouch::xformed_by(const Transform2D &p_xform, co
13661370
st->set_canceled(canceled);
13671371
st->set_double_tap(double_tap);
13681372

1373+
st->merge_meta_from(this);
1374+
13691375
return st;
13701376
}
13711377

@@ -1494,6 +1500,8 @@ Ref<InputEvent> InputEventScreenDrag::xformed_by(const Transform2D &p_xform, con
14941500
sd->set_velocity(p_xform.basis_xform(velocity));
14951501
sd->set_screen_velocity(get_screen_velocity());
14961502

1503+
sd->merge_meta_from(this);
1504+
14971505
return sd;
14981506
}
14991507

@@ -1705,6 +1713,8 @@ Ref<InputEvent> InputEventMagnifyGesture::xformed_by(const Transform2D &p_xform,
17051713
ev->set_position(p_xform.xform(get_position() + p_local_ofs));
17061714
ev->set_factor(get_factor());
17071715

1716+
ev->merge_meta_from(this);
1717+
17081718
return ev;
17091719
}
17101720

@@ -1745,6 +1755,8 @@ Ref<InputEvent> InputEventPanGesture::xformed_by(const Transform2D &p_xform, con
17451755
ev->set_position(p_xform.xform(get_position() + p_local_ofs));
17461756
ev->set_delta(get_delta());
17471757

1758+
ev->merge_meta_from(this);
1759+
17481760
return ev;
17491761
}
17501762

0 commit comments

Comments
 (0)