|
@@ -547,6 +547,7 @@ Error EditorHelp::_goto_desc(const String& p_class,bool p_update_history,int p_v
|
|
class_desc->pop();
|
|
class_desc->pop();
|
|
class_desc->add_newline();
|
|
class_desc->add_newline();
|
|
class_desc->add_newline();
|
|
class_desc->add_newline();
|
|
|
|
+ class_desc->add_newline();
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
@@ -563,6 +564,7 @@ Error EditorHelp::_goto_desc(const String& p_class,bool p_update_history,int p_v
|
|
_add_text(cd.brief_description);
|
|
_add_text(cd.brief_description);
|
|
class_desc->add_newline();
|
|
class_desc->add_newline();
|
|
class_desc->add_newline();
|
|
class_desc->add_newline();
|
|
|
|
+ class_desc->add_newline();
|
|
}
|
|
}
|
|
|
|
|
|
bool method_descr=false;
|
|
bool method_descr=false;
|
|
@@ -637,7 +639,6 @@ Error EditorHelp::_goto_desc(const String& p_class,bool p_update_history,int p_v
|
|
|
|
|
|
if (cd.properties.size()) {
|
|
if (cd.properties.size()) {
|
|
|
|
|
|
-
|
|
|
|
class_desc->push_color(EditorSettings::get_singleton()->get("text_editor/keyword_color"));
|
|
class_desc->push_color(EditorSettings::get_singleton()->get("text_editor/keyword_color"));
|
|
class_desc->push_font(doc_title_font);
|
|
class_desc->push_font(doc_title_font);
|
|
class_desc->add_text("Members:");
|
|
class_desc->add_text("Members:");
|
|
@@ -715,9 +716,10 @@ Error EditorHelp::_goto_desc(const String& p_class,bool p_update_history,int p_v
|
|
class_desc->add_newline();
|
|
class_desc->add_newline();
|
|
}
|
|
}
|
|
|
|
|
|
- class_desc->add_newline();
|
|
|
|
class_desc->pop();
|
|
class_desc->pop();
|
|
|
|
|
|
|
|
+ class_desc->add_newline();
|
|
|
|
+ class_desc->add_newline();
|
|
|
|
|
|
}
|
|
}
|
|
if (cd.signals.size()) {
|
|
if (cd.signals.size()) {
|
|
@@ -779,6 +781,7 @@ Error EditorHelp::_goto_desc(const String& p_class,bool p_update_history,int p_v
|
|
|
|
|
|
class_desc->pop();
|
|
class_desc->pop();
|
|
class_desc->add_newline();
|
|
class_desc->add_newline();
|
|
|
|
+ class_desc->add_newline();
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
@@ -823,6 +826,7 @@ Error EditorHelp::_goto_desc(const String& p_class,bool p_update_history,int p_v
|
|
|
|
|
|
class_desc->pop();
|
|
class_desc->pop();
|
|
class_desc->add_newline();
|
|
class_desc->add_newline();
|
|
|
|
+ class_desc->add_newline();
|
|
|
|
|
|
|
|
|
|
}
|
|
}
|
|
@@ -830,17 +834,18 @@ Error EditorHelp::_goto_desc(const String& p_class,bool p_update_history,int p_v
|
|
if (cd.description!="") {
|
|
if (cd.description!="") {
|
|
|
|
|
|
description_line=class_desc->get_line_count()-2;
|
|
description_line=class_desc->get_line_count()-2;
|
|
|
|
+
|
|
class_desc->push_color(EditorSettings::get_singleton()->get("text_editor/keyword_color"));
|
|
class_desc->push_color(EditorSettings::get_singleton()->get("text_editor/keyword_color"));
|
|
class_desc->push_font(doc_title_font);
|
|
class_desc->push_font(doc_title_font);
|
|
class_desc->add_text("Description:");
|
|
class_desc->add_text("Description:");
|
|
class_desc->pop();
|
|
class_desc->pop();
|
|
class_desc->pop();
|
|
class_desc->pop();
|
|
|
|
|
|
- class_desc->add_newline();
|
|
|
|
class_desc->add_newline();
|
|
class_desc->add_newline();
|
|
_add_text(cd.description);
|
|
_add_text(cd.description);
|
|
class_desc->add_newline();
|
|
class_desc->add_newline();
|
|
class_desc->add_newline();
|
|
class_desc->add_newline();
|
|
|
|
+ class_desc->add_newline();
|
|
}
|
|
}
|
|
|
|
|
|
if (method_descr) {
|
|
if (method_descr) {
|
|
@@ -853,12 +858,16 @@ Error EditorHelp::_goto_desc(const String& p_class,bool p_update_history,int p_v
|
|
|
|
|
|
class_desc->add_newline();
|
|
class_desc->add_newline();
|
|
class_desc->add_newline();
|
|
class_desc->add_newline();
|
|
|
|
+ class_desc->push_indent(1);
|
|
|
|
|
|
|
|
|
|
for(int i=0;i<cd.methods.size();i++) {
|
|
for(int i=0;i<cd.methods.size();i++) {
|
|
|
|
|
|
method_line[cd.methods[i].name]=class_desc->get_line_count()-2;
|
|
method_line[cd.methods[i].name]=class_desc->get_line_count()-2;
|
|
|
|
|
|
|
|
+ if( cd.methods[i].description != "") {
|
|
|
|
+ class_desc->add_newline();
|
|
|
|
+ }
|
|
class_desc->push_font(doc_code_font);
|
|
class_desc->push_font(doc_code_font);
|
|
_add_type(cd.methods[i].return_type);
|
|
_add_type(cd.methods[i].return_type);
|
|
|
|
|
|
@@ -899,9 +908,12 @@ Error EditorHelp::_goto_desc(const String& p_class,bool p_update_history,int p_v
|
|
|
|
|
|
class_desc->pop();
|
|
class_desc->pop();
|
|
|
|
|
|
- class_desc->add_newline();
|
|
|
|
- class_desc->add_newline();
|
|
|
|
- _add_text(cd.methods[i].description);
|
|
|
|
|
|
+ if( cd.methods[i].description != "") {
|
|
|
|
+ class_desc->add_text(" ");
|
|
|
|
+ _add_text(cd.methods[i].description);
|
|
|
|
+ class_desc->add_newline();
|
|
|
|
+ class_desc->add_newline();
|
|
|
|
+ }
|
|
class_desc->add_newline();
|
|
class_desc->add_newline();
|
|
class_desc->add_newline();
|
|
class_desc->add_newline();
|
|
|
|
|
|
@@ -1392,6 +1404,8 @@ EditorHelp::EditorHelp(EditorNode *p_editor) {
|
|
PanelContainer *pc = memnew( PanelContainer );
|
|
PanelContainer *pc = memnew( PanelContainer );
|
|
Ref<StyleBoxFlat> style( memnew( StyleBoxFlat ) );
|
|
Ref<StyleBoxFlat> style( memnew( StyleBoxFlat ) );
|
|
style->set_bg_color( EditorSettings::get_singleton()->get("text_editor/background_color") );
|
|
style->set_bg_color( EditorSettings::get_singleton()->get("text_editor/background_color") );
|
|
|
|
+ style->set_default_margin(MARGIN_LEFT,20);
|
|
|
|
+ style->set_default_margin(MARGIN_TOP,20);
|
|
pc->add_style_override("panel", style); //get_stylebox("normal","TextEdit"));
|
|
pc->add_style_override("panel", style); //get_stylebox("normal","TextEdit"));
|
|
h_split->add_child(pc);
|
|
h_split->add_child(pc);
|
|
class_desc = memnew( RichTextLabel );
|
|
class_desc = memnew( RichTextLabel );
|