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

Merge pull request #11319 from neikeq/docdata-enum-proxy 

DocData: Fix enums for proxy classes
This commit is contained in:
Ignacio Etcheverry 2017-09-16 12:54:53 +02:00 committed by GitHub
parent 9c71b7b91f 7e2c337162
commit 61e9623ced
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editor/doc/doc_data.cpp
View File

@ -170,6 +170,8 @@ static void return_doc_from_retinfo(DocData::MethodDoc &p_method, const Property
if (p_retinfo.type == Variant::INT && p_retinfo.usage & PROPERTY_USAGE_CLASS_IS_ENUM) { if (p_retinfo.type == Variant::INT && p_retinfo.usage & PROPERTY_USAGE_CLASS_IS_ENUM) {
p_method.return_enum = p_retinfo.class_name; p_method.return_enum = p_retinfo.class_name;
if (p_method.return_enum.begins_with("_")) //proxy class
p_method.return_enum = p_method.return_enum.substr(1, p_method.return_enum.length());
p_method.return_type = "int"; p_method.return_type = "int";
} else if (p_retinfo.class_name != StringName()) { } else if (p_retinfo.class_name != StringName()) {
p_method.return_type = p_retinfo.class_name; p_method.return_type = p_retinfo.class_name;
@ -190,6 +192,8 @@ static void argument_doc_from_arginfo(DocData::ArgumentDoc &p_argument, const Pr
if (p_arginfo.type == Variant::INT && p_arginfo.usage & PROPERTY_USAGE_CLASS_IS_ENUM) { if (p_arginfo.type == Variant::INT && p_arginfo.usage & PROPERTY_USAGE_CLASS_IS_ENUM) {
p_argument.enumeration = p_arginfo.class_name; p_argument.enumeration = p_arginfo.class_name;
if (p_argument.enumeration.begins_with("_")) //proxy class
p_argument.enumeration = p_argument.enumeration.substr(1, p_argument.enumeration.length());
p_argument.type = "int"; p_argument.type = "int";
} else if (p_arginfo.class_name != StringName()) { } else if (p_arginfo.class_name != StringName()) {
p_argument.type = p_arginfo.class_name; p_argument.type = p_arginfo.class_name;