diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-02-06 22:50:47 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-02-06 22:50:47 +0100 |
| commit | fe2cd2e6b165bf7f4d789b7b7098ecc27badb80a (patch) | |
| tree | f345635dc8d3ef9827c30e0e03cce3919901c820 | |
| parent | 09b2c5fd05cd3a6a0ed1d74befb302540690684f (diff) | |
| parent | 17ee6fcf03978a8ddfd67020af034ad1d3b7656c (diff) | |
Merge pull request #72770 from Kabiirk/Control-has-point-doc-update
Fix description and argument name in `Control._has_point`
| -rw-r--r-- | doc/classes/Control.xml | 6 | ||||
| -rw-r--r-- | scene/gui/control.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/classes/Control.xml b/doc/classes/Control.xml index d74ddba369..7d7925d61e 100644 --- a/doc/classes/Control.xml +++ b/doc/classes/Control.xml @@ -144,11 +144,11 @@ </method> <method name="_has_point" qualifiers="virtual const"> <return type="bool" /> - <param index="0" name="position" type="Vector2" /> + <param index="0" name="point" type="Vector2" /> <description> - Virtual method to be implemented by the user. Returns whether the given [param position] is inside this control. + Virtual method to be implemented by the user. Returns whether the given [param point] is inside this control. If not overridden, default behavior is checking if the point is within control's Rect. - [b]Note:[/b] If you want to check if a point is inside the control, you can use [code]get_rect().has_point(point)[/code]. + [b]Note:[/b] If you want to check if a point is inside the control, you can use [code]Rect2(Vector2.ZERO, size).has_point(point)[/code]. </description> </method> <method name="_make_custom_tooltip" qualifiers="virtual const"> diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp index a930b8d972..ec75fcb665 100644 --- a/scene/gui/control.cpp +++ b/scene/gui/control.cpp @@ -3392,7 +3392,7 @@ void Control::_bind_methods() { ADD_SIGNAL(MethodInfo("minimum_size_changed")); ADD_SIGNAL(MethodInfo("theme_changed")); - GDVIRTUAL_BIND(_has_point, "position"); + GDVIRTUAL_BIND(_has_point, "point"); GDVIRTUAL_BIND(_structured_text_parser, "args", "text"); GDVIRTUAL_BIND(_get_minimum_size); |