Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix SubViewportContainer processing Events before other Control-Nodes #58334

Merged
merged 1 commit into from
Jan 27, 2023
Merged

Fix SubViewportContainer processing Events before other Control-Nodes #58334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
41 changes: 34 additions & 7 deletions scene/gui/subviewport_container.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,24 +180,51 @@ void SubViewportContainer::input(const Ref<InputEvent> &p_event) {
return;
}

Transform2D xform = get_global_transform_with_canvas();
if (_is_propagated_in_gui_input(p_event)) {
return;
}

if (stretch) {
Transform2D scale_xf;
scale_xf.scale(Vector2(shrink, shrink));
xform *= scale_xf;
_send_event_to_viewports(p_event);
}

void SubViewportContainer::gui_input(const Ref<InputEvent> &p_event) {
ERR_FAIL_COND(p_event.is_null());

if (Engine::get_singleton()->is_editor_hint()) {
return;
}

Ref<InputEvent> ev = p_event->xformed_by(xform.affine_inverse());
if (!_is_propagated_in_gui_input(p_event)) {
return;
}

if (stretch && shrink > 1) {
Transform2D xform;
xform.scale(Vector2(1, 1) / shrink);
_send_event_to_viewports(p_event->xformed_by(xform));
} else {
_send_event_to_viewports(p_event);
}
}

void SubViewportContainer::_send_event_to_viewports(const Ref<InputEvent> &p_event) {
for (int i = 0; i < get_child_count(); i++) {
SubViewport *c = Object::cast_to<SubViewport>(get_child(i));
if (!c || c->is_input_disabled()) {
continue;
}

c->push_input(ev);
c->push_input(p_event);
}
}

bool SubViewportContainer::_is_propagated_in_gui_input(const Ref<InputEvent> &p_event) {
// Propagation of events with a position property happen in gui_input
// Propagation of other events happen in input
if (Object::cast_to<InputEventMouse>(*p_event) || Object::cast_to<InputEventScreenDrag>(*p_event) || Object::cast_to<InputEventScreenTouch>(*p_event) || Object::cast_to<InputEventGesture>(*p_event)) {
return true;
}
return false;
}

void SubViewportContainer::unhandled_input(const Ref<InputEvent> &p_event) {
Expand Down
3 changes: 3 additions & 0 deletions scene/gui/subviewport_container.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ class SubViewportContainer : public Container {
bool stretch = false;
int shrink = 1;
void _notify_viewports(int p_notification);
bool _is_propagated_in_gui_input(const Ref<InputEvent> &p_event);
void _send_event_to_viewports(const Ref<InputEvent> &p_event);

protected:
void _notification(int p_what);
Expand All @@ -49,6 +51,7 @@ class SubViewportContainer : public Container {
bool is_stretch_enabled() const;

virtual void input(const Ref<InputEvent> &p_event) override;
virtual void gui_input(const Ref<InputEvent> &p_event) override;
virtual void unhandled_input(const Ref<InputEvent> &p_event) override;
void set_stretch_shrink(int p_shrink);
int get_stretch_shrink() const;
Expand Down