noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #117869 from akien-mga/revert-116406

Browse Source 
Revert "Expose `Control.call_gui_input`"
This commit is contained in:
Rémi Verschelde
2026-03-26 17:45:51 +01:00
committed by GitHub
parent e3dc665263 707b19f397
commit a1aa0fa2fa
4 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/classes/Control.xml
-10
View File
@@ -774,16 +774,6 @@
Returns [code]true[/code] if the layout is right-to-left. See also [member layout_direction].
</description>
</method>
<method name="call_gui_input">
<return type="void" />
<param index="0" name="event" type="InputEvent" />
<description>
Push a GUI-specific [InputEvent] to this specific [Control] node without affecting focus.
This is a low-level method, so it is your responsibility to manage focus using [method grab_focus] and deliver [constant NOTIFICATION_MOUSE_ENTER] and [constant NOTIFICATION_MOUSE_EXIT] noftifications as needed.
Make sure to convert [member InputEventMouse.position] to local coordinates using [code]event.global_position * control.get_global_transform_with_canvas()[/code]
See [method Viewport.push_input] for the preferred high level way to deliver events to a [Viewport].
</description>
</method>
<method name="release_focus">
<return type="void" />
<description>
scene/gui/control.cpp
+1 -2
View File
@@ -2166,7 +2166,7 @@ Transform2D Control::get_offset_transform() const {
// Input events.
void Control::call_gui_input(const Ref<InputEvent> &p_event) {
void Control::_call_gui_input(const Ref<InputEvent> &p_event) {
if (p_event->get_device() != InputEvent::DEVICE_ID_INTERNAL) {
emit_signal(SceneStringName(gui_input), p_event); // Signal should be first, so it's possible to override an event (and then accept it).
}
@@ -4365,7 +4365,6 @@ void Control::_bind_methods() {
ClassDB::bind_method(D_METHOD("find_prev_valid_focus"), &Control::find_prev_valid_focus);
ClassDB::bind_method(D_METHOD("find_next_valid_focus"), &Control::find_next_valid_focus);
ClassDB::bind_method(D_METHOD("find_valid_focus_neighbor", "side"), &Control::find_valid_focus_neighbor);
ClassDB::bind_method(D_METHOD("call_gui_input", "event"), &Control::call_gui_input);
ClassDB::bind_method(D_METHOD("set_h_size_flags", "flags"), &Control::set_h_size_flags);
ClassDB::bind_method(D_METHOD("get_h_size_flags"), &Control::get_h_size_flags);
scene/gui/control.h
+1 -1
View File
@@ -364,7 +364,7 @@ private:
// Input events.
void call_gui_input(const Ref<InputEvent> &p_event);
void _call_gui_input(const Ref<InputEvent> &p_event);
// Mouse Filter.
scene/main/viewport.cpp
+5 -5
View File
@@ -1764,7 +1764,7 @@ void Viewport::_gui_call_input(Control *p_control, const Ref<InputEvent> &p_inpu
Control *control = Object::cast_to<Control>(ci);
if (control) {
if (control->get_mouse_filter_with_override() != Control::MOUSE_FILTER_IGNORE) {
control->call_gui_input(ev);
control->_call_gui_input(ev);
}
if (!control->is_inside_tree() || control->is_set_as_top_level()) {
@@ -2321,7 +2321,7 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
if (gui.key_focus) {
if (gui.key_focus->can_process()) {
gui.key_focus->call_gui_input(p_event);
gui.key_focus->_call_gui_input(p_event);
}
if (is_input_handled()) {
@@ -2777,7 +2777,7 @@ void Viewport::_drop_mouse_focus() {
mb->set_button_index(MouseButton(i + 1));
mb->set_pressed(false);
mb->set_device(InputEvent::DEVICE_ID_INTERNAL);
c->call_gui_input(mb);
c->_call_gui_input(mb);
}
}
}
@@ -2836,7 +2836,7 @@ void Viewport::_post_gui_grab_click_focus() {
mb->set_button_index(MouseButton(i + 1));
mb->set_pressed(false);
mb->set_device(InputEvent::DEVICE_ID_INTERNAL);
gui.mouse_focus->call_gui_input(mb);
gui.mouse_focus->_call_gui_input(mb);
}
}
@@ -2854,7 +2854,7 @@ void Viewport::_post_gui_grab_click_focus() {
mb->set_button_index(MouseButton(i + 1));
mb->set_pressed(true);
mb->set_device(InputEvent::DEVICE_ID_INTERNAL);
callable_mp(gui.mouse_focus, &Control::call_gui_input).call_deferred(mb);
callable_mp(gui.mouse_focus, &Control::_call_gui_input).call_deferred(mb);
}
}
}