godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Expose _clips_input as a virtual function, closes #15358

This commit is contained in:
Juan Linietsky 2018-07-29 12:46:53 -03:00
parent 0fcc28b6f3
commit c752c26427
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scene/gui/control.cpp
View File

@ -663,6 +663,9 @@ void Control::_notification(int p_notification) {
bool Control::clips_input() const { bool Control::clips_input() const {
if (get_script_instance()) {
return get_script_instance()->call(SceneStringNames::get_singleton()->_clips_input);
}
return false; return false;
} }
bool Control::has_point(const Point2 &p_point) const { bool Control::has_point(const Point2 &p_point) const {
@ -2828,6 +2831,7 @@ void Control::_bind_methods() {
BIND_VMETHOD(MethodInfo(Variant::BOOL, "can_drop_data", PropertyInfo(Variant::VECTOR2, "position"), PropertyInfo(Variant::NIL, "data"))); BIND_VMETHOD(MethodInfo(Variant::BOOL, "can_drop_data", PropertyInfo(Variant::VECTOR2, "position"), PropertyInfo(Variant::NIL, "data")));
BIND_VMETHOD(MethodInfo("drop_data", PropertyInfo(Variant::VECTOR2, "position"), PropertyInfo(Variant::NIL, "data"))); BIND_VMETHOD(MethodInfo("drop_data", PropertyInfo(Variant::VECTOR2, "position"), PropertyInfo(Variant::NIL, "data")));
BIND_VMETHOD(MethodInfo(Variant::OBJECT, "_make_custom_tooltip", PropertyInfo(Variant::STRING, "for_text"))); BIND_VMETHOD(MethodInfo(Variant::OBJECT, "_make_custom_tooltip", PropertyInfo(Variant::STRING, "for_text")));
BIND_VMETHOD(MethodInfo(Variant::BOOL, "_clips_input"));
ADD_GROUP("Anchor", "anchor_"); ADD_GROUP("Anchor", "anchor_");
ADD_PROPERTYI(PropertyInfo(Variant::REAL, "anchor_left", PROPERTY_HINT_RANGE, "0,1,0.01"), "_set_anchor", "get_anchor", MARGIN_LEFT); ADD_PROPERTYI(PropertyInfo(Variant::REAL, "anchor_left", PROPERTY_HINT_RANGE, "0,1,0.01"), "_set_anchor", "get_anchor", MARGIN_LEFT);

2
scene/scene_string_names.cpp
View File

@ -102,6 +102,8 @@ SceneStringNames::SceneStringNames() {
_update_scroll = StaticCString::create("_update_scroll"); _update_scroll = StaticCString::create("_update_scroll");
_update_xform = StaticCString::create("_update_xform"); _update_xform = StaticCString::create("_update_xform");
_clips_input = StaticCString::create("_clips_input");
_proxgroup_add = StaticCString::create("_proxgroup_add"); _proxgroup_add = StaticCString::create("_proxgroup_add");
_proxgroup_remove = StaticCString::create("_proxgroup_remove"); _proxgroup_remove = StaticCString::create("_proxgroup_remove");

2
scene/scene_string_names.h
View File

@ -127,6 +127,8 @@ public:
StringName _update_scroll; StringName _update_scroll;
StringName _update_xform; StringName _update_xform;
StringName _clips_input;
StringName _proxgroup_add; StringName _proxgroup_add;
StringName _proxgroup_remove; StringName _proxgroup_remove;