summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2017-03-18 10:36:55 +0100
committerGitHub <noreply@github.com>2017-03-18 10:36:55 +0100
commit3cf4103a89bf15af81bf6fd6fa1626423b718f5e (patch)
treebc6fd67e4f538e3da1b24449b859409254f7b0ba
parent5b6900ed9beabcd0cdbf339cfc22a05ec865d34a (diff)
parent9589936d6e59fe370297867548f65cb356172120 (diff)
Merge pull request #8023 from CrazyGuy108/master
List Control::has_point as a virtual method
-rw-r--r--doc/base/classes.xml8
-rw-r--r--scene/gui/control.cpp2
2 files changed, 10 insertions, 0 deletions
diff --git a/doc/base/classes.xml b/doc/base/classes.xml
index 71594887fc..0b6e2d99ea 100644
--- a/doc/base/classes.xml
+++ b/doc/base/classes.xml
@@ -9810,6 +9810,14 @@
<description>
</description>
</method>
+ <method name="has_point" qualifiers="virtual">
+ <return type="bool">
+ </return>
+ <argument index="0" name="point" type="Vector2">
+ </argument>
+ <description>
+ </description>
+ </method>
<method name="has_stylebox" qualifiers="const">
<return type="bool">
</return>
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp
index 2f40f0acec..a8e364a4cd 100644
--- a/scene/gui/control.cpp
+++ b/scene/gui/control.cpp
@@ -2514,6 +2514,8 @@ void Control::_bind_methods() {
ADD_SIGNAL(MethodInfo("size_flags_changed"));
ADD_SIGNAL(MethodInfo("minimum_size_changed"));
ADD_SIGNAL(MethodInfo("modal_closed"));
+
+ BIND_VMETHOD(MethodInfo("has_point", PropertyInfo(Variant::VECTOR2, "point")));
}
Control::Control() {