diff options
Diffstat (limited to 'scene/main/viewport.cpp')
| -rw-r--r-- | scene/main/viewport.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index 5952af60ee..a86a685fc3 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -1383,6 +1383,13 @@ Ref<InputEvent> Viewport::_make_input_local(const Ref<InputEvent> &ev) { } Transform2D ai = get_final_transform().affine_inverse(); + Ref<InputEventMouse> me = ev; + if (me.is_valid()) { + me = me->xformed_by(ai); + // For InputEventMouse, the global position is not adjusted by ev->xformed_by() and needs to be set separately. + me->set_global_position(me->get_position()); + return me; + } return ev->xformed_by(ai); } @@ -3510,9 +3517,9 @@ Variant Viewport::gui_get_drag_data() const { return gui.drag_data; } -Array Viewport::get_configuration_warnings() const { - ERR_MAIN_THREAD_GUARD_V(Array()); - Array warnings = Node::get_configuration_warnings(); +PackedStringArray Viewport::get_configuration_warnings() const { + ERR_MAIN_THREAD_GUARD_V(PackedStringArray()); + PackedStringArray warnings = Node::get_configuration_warnings(); if (size.x <= 1 || size.y <= 1) { warnings.push_back(RTR("The Viewport size must be greater than or equal to 2 pixels on both dimensions to render anything.")); |