You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-30 16:26:50 +00:00
Style: clang-format: Disable KeepEmptyLinesAtTheStartOfBlocks
Which means that reduz' beloved style which we all became used to will now be changed automatically to remove the first empty line. This makes us lean closer to 1TBS (the one true brace style) instead of hybridating it with some Allman-inspired spacing. There's still the case of braces around single-statement blocks that needs to be addressed (but clang-format can't help with that, but clang-tidy may if we agree about it). Part of #33027.
This commit is contained in:
Rémi Verschelde
@@ -43,7 +43,6 @@
|
||||
DocData *EditorHelp::doc = nullptr;
|
||||
|
||||
void EditorHelp::_init_colors() {
|
||||
|
||||
title_color = get_theme_color("accent_color", "Editor");
|
||||
text_color = get_theme_color("default_color", "RichTextLabel");
|
||||
headline_color = get_theme_color("headline_color", "EditorHelp");
|
||||
@@ -58,21 +57,18 @@ void EditorHelp::_init_colors() {
|
||||
}
|
||||
|
||||
void EditorHelp::_unhandled_key_input(const Ref<InputEvent> &p_ev) {
|
||||
|
||||
if (!is_visible_in_tree())
|
||||
return;
|
||||
|
||||
Ref<InputEventKey> k = p_ev;
|
||||
|
||||
if (k.is_valid() && k->get_control() && k->get_keycode() == KEY_F) {
|
||||
|
||||
search->grab_focus();
|
||||
search->select_all();
|
||||
}
|
||||
}
|
||||
|
||||
void EditorHelp::_search(bool p_search_previous) {
|
||||
|
||||
if (p_search_previous)
|
||||
find_bar->search_prev();
|
||||
else
|
||||
@@ -80,12 +76,10 @@ void EditorHelp::_search(bool p_search_previous) {
|
||||
}
|
||||
|
||||
void EditorHelp::_class_list_select(const String &p_select) {
|
||||
|
||||
_goto_desc(p_select);
|
||||
}
|
||||
|
||||
void EditorHelp::_class_desc_select(const String &p_select) {
|
||||
|
||||
if (p_select.begins_with("$")) { //enum
|
||||
String select = p_select.substr(1, p_select.length());
|
||||
String class_name;
|
||||
@@ -182,7 +176,6 @@ void EditorHelp::_class_desc_resized() {
|
||||
}
|
||||
|
||||
void EditorHelp::_add_type(const String &p_type, const String &p_enum) {
|
||||
|
||||
String t = p_type;
|
||||
if (t.empty())
|
||||
t = "void";
|
||||
@@ -224,7 +217,6 @@ void EditorHelp::_add_type(const String &p_type, const String &p_enum) {
|
||||
}
|
||||
|
||||
String EditorHelp::_fix_constant(const String &p_constant) const {
|
||||
|
||||
if (p_constant.strip_edges() == "4294967295") {
|
||||
return "0xFFFFFFFF";
|
||||
}
|
||||
@@ -241,7 +233,6 @@ String EditorHelp::_fix_constant(const String &p_constant) const {
|
||||
}
|
||||
|
||||
void EditorHelp::_add_method(const DocData::MethodDoc &p_method, bool p_overview) {
|
||||
|
||||
method_line[p_method.name] = class_desc->get_line_count() - 2; //gets overridden if description
|
||||
|
||||
const bool is_vararg = p_method.qualifiers.find("vararg") != -1;
|
||||
@@ -286,7 +277,6 @@ void EditorHelp::_add_method(const DocData::MethodDoc &p_method, bool p_overview
|
||||
class_desc->add_text(": ");
|
||||
_add_type(p_method.arguments[j].type, p_method.arguments[j].enumeration);
|
||||
if (p_method.arguments[j].default_value != "") {
|
||||
|
||||
class_desc->push_color(symbol_color);
|
||||
class_desc->add_text(" = ");
|
||||
class_desc->pop();
|
||||
@@ -312,7 +302,6 @@ void EditorHelp::_add_method(const DocData::MethodDoc &p_method, bool p_overview
|
||||
class_desc->add_text(")");
|
||||
class_desc->pop();
|
||||
if (p_method.qualifiers != "") {
|
||||
|
||||
class_desc->push_color(qualifier_color);
|
||||
class_desc->add_text(" ");
|
||||
_add_text(p_method.qualifiers);
|
||||
@@ -324,7 +313,6 @@ void EditorHelp::_add_method(const DocData::MethodDoc &p_method, bool p_overview
|
||||
}
|
||||
|
||||
Error EditorHelp::_goto_desc(const String &p_class, int p_vscr) {
|
||||
|
||||
if (!doc->class_list.has(p_class))
|
||||
return ERR_DOES_NOT_EXIST;
|
||||
|
||||
@@ -378,7 +366,6 @@ void EditorHelp::_update_doc() {
|
||||
|
||||
// Ascendents
|
||||
if (cd.inherits != "") {
|
||||
|
||||
class_desc->push_color(title_color);
|
||||
class_desc->push_font(doc_font);
|
||||
class_desc->add_text(TTR("Inherits:") + " ");
|
||||
@@ -402,14 +389,11 @@ void EditorHelp::_update_doc() {
|
||||
|
||||
// Descendents
|
||||
if (ClassDB::class_exists(cd.name)) {
|
||||
|
||||
bool found = false;
|
||||
bool prev = false;
|
||||
|
||||
for (Map<String, DocData::ClassDoc>::Element *E = doc->class_list.front(); E; E = E->next()) {
|
||||
|
||||
if (E->get().inherits == cd.name) {
|
||||
|
||||
if (!found) {
|
||||
class_desc->push_color(title_color);
|
||||
class_desc->push_font(doc_font);
|
||||
@@ -419,7 +403,6 @@ void EditorHelp::_update_doc() {
|
||||
}
|
||||
|
||||
if (prev) {
|
||||
|
||||
class_desc->add_text(" , ");
|
||||
}
|
||||
|
||||
@@ -439,7 +422,6 @@ void EditorHelp::_update_doc() {
|
||||
|
||||
// Brief description
|
||||
if (cd.brief_description != "") {
|
||||
|
||||
class_desc->push_color(text_color);
|
||||
class_desc->push_font(doc_bold_font);
|
||||
class_desc->push_indent(1);
|
||||
@@ -454,7 +436,6 @@ void EditorHelp::_update_doc() {
|
||||
|
||||
// Class description
|
||||
if (cd.description != "") {
|
||||
|
||||
section_line.push_back(Pair<String, int>(TTR("Description"), class_desc->get_line_count() - 2));
|
||||
description_line = class_desc->get_line_count() - 2;
|
||||
class_desc->push_color(title_color);
|
||||
@@ -514,7 +495,6 @@ void EditorHelp::_update_doc() {
|
||||
bool property_descr = false;
|
||||
|
||||
if (cd.properties.size()) {
|
||||
|
||||
section_line.push_back(Pair<String, int>(TTR("Properties"), class_desc->get_line_count() - 2));
|
||||
class_desc->push_color(title_color);
|
||||
class_desc->push_font(doc_title_font);
|
||||
@@ -614,7 +594,6 @@ void EditorHelp::_update_doc() {
|
||||
}
|
||||
|
||||
if (methods.size()) {
|
||||
|
||||
if (sort_methods)
|
||||
methods.sort();
|
||||
|
||||
@@ -688,7 +667,6 @@ void EditorHelp::_update_doc() {
|
||||
|
||||
// Theme properties
|
||||
if (cd.theme_properties.size()) {
|
||||
|
||||
section_line.push_back(Pair<String, int>(TTR("Theme Properties"), class_desc->get_line_count() - 2));
|
||||
class_desc->push_color(title_color);
|
||||
class_desc->push_font(doc_title_font);
|
||||
@@ -701,7 +679,6 @@ void EditorHelp::_update_doc() {
|
||||
class_desc->set_table_column_expand(1, true);
|
||||
|
||||
for (int i = 0; i < cd.theme_properties.size(); i++) {
|
||||
|
||||
theme_property_line[cd.theme_properties[i].name] = class_desc->get_line_count() - 2; //gets overridden if description
|
||||
|
||||
class_desc->push_cell();
|
||||
@@ -751,7 +728,6 @@ void EditorHelp::_update_doc() {
|
||||
|
||||
// Signals
|
||||
if (cd.signals.size()) {
|
||||
|
||||
if (sort_methods) {
|
||||
cd.signals.sort();
|
||||
}
|
||||
@@ -769,7 +745,6 @@ void EditorHelp::_update_doc() {
|
||||
class_desc->push_indent(1);
|
||||
|
||||
for (int i = 0; i < cd.signals.size(); i++) {
|
||||
|
||||
signal_line[cd.signals[i].name] = class_desc->get_line_count() - 2; //gets overridden if description
|
||||
class_desc->push_font(doc_code_font); // monofont
|
||||
class_desc->push_color(headline_color);
|
||||
@@ -787,7 +762,6 @@ void EditorHelp::_update_doc() {
|
||||
class_desc->add_text(": ");
|
||||
_add_type(cd.signals[i].arguments[j].type);
|
||||
if (cd.signals[i].arguments[j].default_value != "") {
|
||||
|
||||
class_desc->push_color(symbol_color);
|
||||
class_desc->add_text(" = ");
|
||||
class_desc->pop();
|
||||
@@ -802,7 +776,6 @@ void EditorHelp::_update_doc() {
|
||||
class_desc->pop();
|
||||
class_desc->pop(); // end monofont
|
||||
if (cd.signals[i].description != "") {
|
||||
|
||||
class_desc->push_font(doc_font);
|
||||
class_desc->push_color(comment_color);
|
||||
class_desc->push_indent(1);
|
||||
@@ -821,12 +794,10 @@ void EditorHelp::_update_doc() {
|
||||
|
||||
// Constants and enums
|
||||
if (cd.constants.size()) {
|
||||
|
||||
Map<String, Vector<DocData::ConstantDoc>> enums;
|
||||
Vector<DocData::ConstantDoc> constants;
|
||||
|
||||
for (int i = 0; i < cd.constants.size(); i++) {
|
||||
|
||||
if (cd.constants[i].enumeration != String()) {
|
||||
if (!enums.has(cd.constants[i].enumeration)) {
|
||||
enums[cd.constants[i].enumeration] = Vector<DocData::ConstantDoc>();
|
||||
@@ -834,14 +805,12 @@ void EditorHelp::_update_doc() {
|
||||
|
||||
enums[cd.constants[i].enumeration].push_back(cd.constants[i]);
|
||||
} else {
|
||||
|
||||
constants.push_back(cd.constants[i]);
|
||||
}
|
||||
}
|
||||
|
||||
// Enums
|
||||
if (enums.size()) {
|
||||
|
||||
section_line.push_back(Pair<String, int>(TTR("Enumerations"), class_desc->get_line_count() - 2));
|
||||
class_desc->push_color(title_color);
|
||||
class_desc->push_font(doc_title_font);
|
||||
@@ -853,7 +822,6 @@ void EditorHelp::_update_doc() {
|
||||
class_desc->add_newline();
|
||||
|
||||
for (Map<String, Vector<DocData::ConstantDoc>>::Element *E = enums.front(); E; E = E->next()) {
|
||||
|
||||
enum_line[E->key()] = class_desc->get_line_count() - 2;
|
||||
|
||||
class_desc->push_color(title_color);
|
||||
@@ -927,7 +895,6 @@ void EditorHelp::_update_doc() {
|
||||
|
||||
// Constants
|
||||
if (constants.size()) {
|
||||
|
||||
section_line.push_back(Pair<String, int>(TTR("Constants"), class_desc->get_line_count() - 2));
|
||||
class_desc->push_color(title_color);
|
||||
class_desc->push_font(doc_title_font);
|
||||
@@ -939,7 +906,6 @@ void EditorHelp::_update_doc() {
|
||||
class_desc->add_newline();
|
||||
|
||||
for (int i = 0; i < constants.size(); i++) {
|
||||
|
||||
constant_line[constants[i].name] = class_desc->get_line_count() - 2;
|
||||
class_desc->push_font(doc_code_font);
|
||||
|
||||
@@ -986,7 +952,6 @@ void EditorHelp::_update_doc() {
|
||||
|
||||
// Property descriptions
|
||||
if (property_descr) {
|
||||
|
||||
section_line.push_back(Pair<String, int>(TTR("Property Descriptions"), class_desc->get_line_count() - 2));
|
||||
class_desc->push_color(title_color);
|
||||
class_desc->push_font(doc_title_font);
|
||||
@@ -998,7 +963,6 @@ void EditorHelp::_update_doc() {
|
||||
class_desc->add_newline();
|
||||
|
||||
for (int i = 0; i < cd.properties.size(); i++) {
|
||||
|
||||
if (cd.properties[i].overridden)
|
||||
continue;
|
||||
|
||||
@@ -1038,7 +1002,6 @@ void EditorHelp::_update_doc() {
|
||||
class_desc->pop(); // cell
|
||||
|
||||
if (cd.properties[i].setter != "") {
|
||||
|
||||
class_desc->push_cell();
|
||||
class_desc->pop(); // cell
|
||||
|
||||
@@ -1056,7 +1019,6 @@ void EditorHelp::_update_doc() {
|
||||
}
|
||||
|
||||
if (cd.properties[i].getter != "") {
|
||||
|
||||
class_desc->push_cell();
|
||||
class_desc->pop(); // cell
|
||||
|
||||
@@ -1101,7 +1063,6 @@ void EditorHelp::_update_doc() {
|
||||
|
||||
// Method descriptions
|
||||
if (method_descr) {
|
||||
|
||||
section_line.push_back(Pair<String, int>(TTR("Method Descriptions"), class_desc->get_line_count() - 2));
|
||||
class_desc->push_color(title_color);
|
||||
class_desc->push_font(doc_title_font);
|
||||
@@ -1123,7 +1084,6 @@ void EditorHelp::_update_doc() {
|
||||
}
|
||||
|
||||
for (int i = 0; i < methods_filtered.size(); i++) {
|
||||
|
||||
class_desc->push_font(doc_code_font);
|
||||
_add_method(methods_filtered[i], false);
|
||||
class_desc->pop();
|
||||
@@ -1165,7 +1125,6 @@ void EditorHelp::_request_help(const String &p_string) {
|
||||
}
|
||||
|
||||
void EditorHelp::_help_callback(const String &p_topic) {
|
||||
|
||||
String what = p_topic.get_slice(":", 0);
|
||||
String clss = p_topic.get_slice(":", 1);
|
||||
String name;
|
||||
@@ -1217,7 +1176,6 @@ void EditorHelp::_help_callback(const String &p_topic) {
|
||||
}
|
||||
|
||||
static void _add_text_to_rt(const String &p_bbcode, RichTextLabel *p_rt) {
|
||||
|
||||
DocData *doc = EditorHelp::get_doc_data();
|
||||
String base_path;
|
||||
|
||||
@@ -1244,7 +1202,6 @@ static void _add_text_to_rt(const String &p_bbcode, RichTextLabel *p_rt) {
|
||||
|
||||
int pos = 0;
|
||||
while (pos < bbcode.length()) {
|
||||
|
||||
int brk_pos = bbcode.find("[", pos);
|
||||
|
||||
if (brk_pos < 0)
|
||||
@@ -1263,7 +1220,6 @@ static void _add_text_to_rt(const String &p_bbcode, RichTextLabel *p_rt) {
|
||||
int brk_end = bbcode.find("]", brk_pos + 1);
|
||||
|
||||
if (brk_end == -1) {
|
||||
|
||||
String text = bbcode.substr(brk_pos, bbcode.length() - brk_pos);
|
||||
if (!code_tag)
|
||||
text = text.replace("\n", "\n\n");
|
||||
@@ -1278,7 +1234,6 @@ static void _add_text_to_rt(const String &p_bbcode, RichTextLabel *p_rt) {
|
||||
bool tag_ok = tag_stack.size() && tag_stack.front()->get() == tag.substr(1, tag.length());
|
||||
|
||||
if (!tag_ok) {
|
||||
|
||||
p_rt->add_text("[");
|
||||
pos = brk_pos + 1;
|
||||
continue;
|
||||
@@ -1295,12 +1250,10 @@ static void _add_text_to_rt(const String &p_bbcode, RichTextLabel *p_rt) {
|
||||
code_tag = false;
|
||||
|
||||
} else if (code_tag) {
|
||||
|
||||
p_rt->add_text("[");
|
||||
pos = brk_pos + 1;
|
||||
|
||||
} else if (tag.begins_with("method ") || tag.begins_with("member ") || tag.begins_with("signal ") || tag.begins_with("enum ") || tag.begins_with("constant ")) {
|
||||
|
||||
int tag_end = tag.find(" ");
|
||||
|
||||
String link_tag = tag.substr(0, tag_end);
|
||||
@@ -1314,7 +1267,6 @@ static void _add_text_to_rt(const String &p_bbcode, RichTextLabel *p_rt) {
|
||||
pos = brk_end + 1;
|
||||
|
||||
} else if (doc->class_list.has(tag)) {
|
||||
|
||||
p_rt->push_color(link_color);
|
||||
p_rt->push_meta("#" + tag);
|
||||
p_rt->add_text(tag);
|
||||
@@ -1323,19 +1275,16 @@ static void _add_text_to_rt(const String &p_bbcode, RichTextLabel *p_rt) {
|
||||
pos = brk_end + 1;
|
||||
|
||||
} else if (tag == "b") {
|
||||
|
||||
//use bold font
|
||||
p_rt->push_font(doc_bold_font);
|
||||
pos = brk_end + 1;
|
||||
tag_stack.push_front(tag);
|
||||
} else if (tag == "i") {
|
||||
|
||||
//use italics font
|
||||
p_rt->push_color(font_color_hl);
|
||||
pos = brk_end + 1;
|
||||
tag_stack.push_front(tag);
|
||||
} else if (tag == "code" || tag == "codeblock") {
|
||||
|
||||
//use monospace font
|
||||
p_rt->push_font(doc_code_font);
|
||||
p_rt->push_color(code_color);
|
||||
@@ -1343,7 +1292,6 @@ static void _add_text_to_rt(const String &p_bbcode, RichTextLabel *p_rt) {
|
||||
pos = brk_end + 1;
|
||||
tag_stack.push_front(tag);
|
||||
} else if (tag == "kbd") {
|
||||
|
||||
//use keyboard font with custom color
|
||||
p_rt->push_font(doc_kbd_font);
|
||||
p_rt->push_color(kbd_color);
|
||||
@@ -1351,31 +1299,26 @@ static void _add_text_to_rt(const String &p_bbcode, RichTextLabel *p_rt) {
|
||||
pos = brk_end + 1;
|
||||
tag_stack.push_front(tag);
|
||||
} else if (tag == "center") {
|
||||
|
||||
//align to center
|
||||
p_rt->push_align(RichTextLabel::ALIGN_CENTER);
|
||||
pos = brk_end + 1;
|
||||
tag_stack.push_front(tag);
|
||||
} else if (tag == "br") {
|
||||
|
||||
//force a line break
|
||||
p_rt->add_newline();
|
||||
pos = brk_end + 1;
|
||||
} else if (tag == "u") {
|
||||
|
||||
//use underline
|
||||
p_rt->push_underline();
|
||||
pos = brk_end + 1;
|
||||
tag_stack.push_front(tag);
|
||||
} else if (tag == "s") {
|
||||
|
||||
//use strikethrough
|
||||
p_rt->push_strikethrough();
|
||||
pos = brk_end + 1;
|
||||
tag_stack.push_front(tag);
|
||||
|
||||
} else if (tag == "url") {
|
||||
|
||||
int end = bbcode.find("[", brk_end);
|
||||
if (end == -1)
|
||||
end = bbcode.length();
|
||||
@@ -1385,13 +1328,11 @@ static void _add_text_to_rt(const String &p_bbcode, RichTextLabel *p_rt) {
|
||||
pos = brk_end + 1;
|
||||
tag_stack.push_front(tag);
|
||||
} else if (tag.begins_with("url=")) {
|
||||
|
||||
String url = tag.substr(4, tag.length());
|
||||
p_rt->push_meta(url);
|
||||
pos = brk_end + 1;
|
||||
tag_stack.push_front("url");
|
||||
} else if (tag == "img") {
|
||||
|
||||
int end = bbcode.find("[", brk_end);
|
||||
if (end == -1)
|
||||
end = bbcode.length();
|
||||
@@ -1404,7 +1345,6 @@ static void _add_text_to_rt(const String &p_bbcode, RichTextLabel *p_rt) {
|
||||
pos = end;
|
||||
tag_stack.push_front(tag);
|
||||
} else if (tag.begins_with("color=")) {
|
||||
|
||||
String col = tag.substr(6, tag.length());
|
||||
Color color;
|
||||
|
||||
@@ -1450,7 +1390,6 @@ static void _add_text_to_rt(const String &p_bbcode, RichTextLabel *p_rt) {
|
||||
tag_stack.push_front("color");
|
||||
|
||||
} else if (tag.begins_with("font=")) {
|
||||
|
||||
String fnt = tag.substr(5, tag.length());
|
||||
|
||||
Ref<Font> font = ResourceLoader::load(base_path.plus_file(fnt), "Font");
|
||||
@@ -1464,7 +1403,6 @@ static void _add_text_to_rt(const String &p_bbcode, RichTextLabel *p_rt) {
|
||||
tag_stack.push_front("font");
|
||||
|
||||
} else {
|
||||
|
||||
p_rt->add_text("["); //ignore
|
||||
pos = brk_pos + 1;
|
||||
}
|
||||
@@ -1476,7 +1414,6 @@ void EditorHelp::_add_text(const String &p_bbcode) {
|
||||
}
|
||||
|
||||
void EditorHelp::generate_doc() {
|
||||
|
||||
doc = memnew(DocData);
|
||||
doc->generate(true);
|
||||
DocData compdoc;
|
||||
@@ -1485,11 +1422,9 @@ void EditorHelp::generate_doc() {
|
||||
}
|
||||
|
||||
void EditorHelp::_notification(int p_what) {
|
||||
|
||||
switch (p_what) {
|
||||
case NOTIFICATION_READY:
|
||||
case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: {
|
||||
|
||||
_update_doc();
|
||||
} break;
|
||||
case NOTIFICATION_THEME_CHANGED: {
|
||||
@@ -1503,12 +1438,10 @@ void EditorHelp::_notification(int p_what) {
|
||||
}
|
||||
|
||||
void EditorHelp::go_to_help(const String &p_help) {
|
||||
|
||||
_help_callback(p_help);
|
||||
}
|
||||
|
||||
void EditorHelp::go_to_class(const String &p_class, int p_scroll) {
|
||||
|
||||
_goto_desc(p_class, p_scroll);
|
||||
}
|
||||
|
||||
@@ -1527,12 +1460,10 @@ void EditorHelp::scroll_to_section(int p_section_index) {
|
||||
}
|
||||
|
||||
void EditorHelp::popup_search() {
|
||||
|
||||
find_bar->popup_search();
|
||||
}
|
||||
|
||||
String EditorHelp::get_class() {
|
||||
|
||||
return edited_class;
|
||||
}
|
||||
|
||||
@@ -1541,16 +1472,13 @@ void EditorHelp::search_again(bool p_search_previous) {
|
||||
}
|
||||
|
||||
int EditorHelp::get_scroll() const {
|
||||
|
||||
return class_desc->get_v_scroll()->get_value();
|
||||
}
|
||||
void EditorHelp::set_scroll(int p_scroll) {
|
||||
|
||||
class_desc->get_v_scroll()->set_value(p_scroll);
|
||||
}
|
||||
|
||||
void EditorHelp::_bind_methods() {
|
||||
|
||||
ClassDB::bind_method("_class_list_select", &EditorHelp::_class_list_select);
|
||||
ClassDB::bind_method("_request_help", &EditorHelp::_request_help);
|
||||
ClassDB::bind_method("_unhandled_key_input", &EditorHelp::_unhandled_key_input);
|
||||
@@ -1561,7 +1489,6 @@ void EditorHelp::_bind_methods() {
|
||||
}
|
||||
|
||||
EditorHelp::EditorHelp() {
|
||||
|
||||
set_custom_minimum_size(Size2(150 * EDSCALE, 0));
|
||||
|
||||
EDITOR_DEF("text_editor/help/sort_functions_alphabetically", true);
|
||||
@@ -1593,14 +1520,12 @@ EditorHelp::~EditorHelp() {
|
||||
}
|
||||
|
||||
void EditorHelpBit::_go_to_help(String p_what) {
|
||||
|
||||
EditorNode::get_singleton()->set_visible_editor(EditorNode::EDITOR_SCRIPT);
|
||||
ScriptEditor::get_singleton()->goto_help(p_what);
|
||||
emit_signal("request_hide");
|
||||
}
|
||||
|
||||
void EditorHelpBit::_meta_clicked(String p_select) {
|
||||
|
||||
if (p_select.begins_with("$")) { //enum
|
||||
|
||||
String select = p_select.substr(1, p_select.length());
|
||||
@@ -1613,11 +1538,9 @@ void EditorHelpBit::_meta_clicked(String p_select) {
|
||||
_go_to_help("class_enum:" + class_name + ":" + select);
|
||||
return;
|
||||
} else if (p_select.begins_with("#")) {
|
||||
|
||||
_go_to_help("class_name:" + p_select.substr(1, p_select.length()));
|
||||
return;
|
||||
} else if (p_select.begins_with("@")) {
|
||||
|
||||
String m = p_select.substr(1, p_select.length());
|
||||
|
||||
if (m.find(".") != -1)
|
||||
@@ -1626,13 +1549,11 @@ void EditorHelpBit::_meta_clicked(String p_select) {
|
||||
}
|
||||
|
||||
void EditorHelpBit::_bind_methods() {
|
||||
|
||||
ClassDB::bind_method(D_METHOD("set_text", "text"), &EditorHelpBit::set_text);
|
||||
ADD_SIGNAL(MethodInfo("request_hide"));
|
||||
}
|
||||
|
||||
void EditorHelpBit::_notification(int p_what) {
|
||||
|
||||
switch (p_what) {
|
||||
case NOTIFICATION_READY: {
|
||||
rich_text->clear();
|
||||
@@ -1640,7 +1561,6 @@ void EditorHelpBit::_notification(int p_what) {
|
||||
|
||||
} break;
|
||||
case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: {
|
||||
|
||||
rich_text->add_theme_color_override("selection_color", get_theme_color("accent_color", "Editor") * Color(1, 1, 1, 0.4));
|
||||
} break;
|
||||
default:
|
||||
@@ -1649,14 +1569,12 @@ void EditorHelpBit::_notification(int p_what) {
|
||||
}
|
||||
|
||||
void EditorHelpBit::set_text(const String &p_text) {
|
||||
|
||||
text = p_text;
|
||||
rich_text->clear();
|
||||
_add_text_to_rt(text, rich_text);
|
||||
}
|
||||
|
||||
EditorHelpBit::EditorHelpBit() {
|
||||
|
||||
rich_text = memnew(RichTextLabel);
|
||||
add_child(rich_text);
|
||||
rich_text->connect("meta_clicked", callable_mp(this, &EditorHelpBit::_meta_clicked));
|
||||
@@ -1666,7 +1584,6 @@ EditorHelpBit::EditorHelpBit() {
|
||||
}
|
||||
|
||||
FindBar::FindBar() {
|
||||
|
||||
search_text = memnew(LineEdit);
|
||||
add_child(search_text);
|
||||
search_text->set_custom_minimum_size(Size2(100 * EDSCALE, 0));
|
||||
@@ -1701,7 +1618,6 @@ FindBar::FindBar() {
|
||||
}
|
||||
|
||||
void FindBar::popup_search() {
|
||||
|
||||
show();
|
||||
bool grabbed_focus = false;
|
||||
if (!search_text->has_focus()) {
|
||||
@@ -1719,11 +1635,9 @@ void FindBar::popup_search() {
|
||||
}
|
||||
|
||||
void FindBar::_notification(int p_what) {
|
||||
|
||||
switch (p_what) {
|
||||
case NOTIFICATION_ENTER_TREE:
|
||||
case NOTIFICATION_THEME_CHANGED: {
|
||||
|
||||
find_prev->set_icon(get_theme_icon("MoveUp", "EditorIcons"));
|
||||
find_next->set_icon(get_theme_icon("MoveDown", "EditorIcons"));
|
||||
hide_button->set_normal_texture(get_theme_icon("Close", "EditorIcons"));
|
||||
@@ -1733,36 +1647,30 @@ void FindBar::_notification(int p_what) {
|
||||
matches_label->add_theme_color_override("font_color", results_count > 0 ? get_theme_color("font_color", "Label") : get_theme_color("error_color", "Editor"));
|
||||
} break;
|
||||
case NOTIFICATION_VISIBILITY_CHANGED: {
|
||||
|
||||
set_process_unhandled_input(is_visible_in_tree());
|
||||
} break;
|
||||
}
|
||||
}
|
||||
|
||||
void FindBar::_bind_methods() {
|
||||
|
||||
ClassDB::bind_method("_unhandled_input", &FindBar::_unhandled_input);
|
||||
|
||||
ADD_SIGNAL(MethodInfo("search"));
|
||||
}
|
||||
|
||||
void FindBar::set_rich_text_label(RichTextLabel *p_rich_text_label) {
|
||||
|
||||
rich_text_label = p_rich_text_label;
|
||||
}
|
||||
|
||||
bool FindBar::search_next() {
|
||||
|
||||
return _search();
|
||||
}
|
||||
|
||||
bool FindBar::search_prev() {
|
||||
|
||||
return _search(true);
|
||||
}
|
||||
|
||||
bool FindBar::_search(bool p_search_previous) {
|
||||
|
||||
String stext = search_text->get_text();
|
||||
bool keep = prev_search == stext;
|
||||
|
||||
@@ -1784,7 +1692,6 @@ bool FindBar::_search(bool p_search_previous) {
|
||||
}
|
||||
|
||||
void FindBar::_update_results_count() {
|
||||
|
||||
results_count = 0;
|
||||
|
||||
String searched = search_text->get_text();
|
||||
@@ -1806,7 +1713,6 @@ void FindBar::_update_results_count() {
|
||||
}
|
||||
|
||||
void FindBar::_update_matches_label() {
|
||||
|
||||
if (search_text->get_text().empty() || results_count == -1) {
|
||||
matches_label->hide();
|
||||
} else {
|
||||
@@ -1818,7 +1724,6 @@ void FindBar::_update_matches_label() {
|
||||
}
|
||||
|
||||
void FindBar::_hide_bar() {
|
||||
|
||||
if (search_text->has_focus())
|
||||
rich_text_label->grab_focus();
|
||||
|
||||
@@ -1826,22 +1731,16 @@ void FindBar::_hide_bar() {
|
||||
}
|
||||
|
||||
void FindBar::_unhandled_input(const Ref<InputEvent> &p_event) {
|
||||
|
||||
Ref<InputEventKey> k = p_event;
|
||||
if (k.is_valid()) {
|
||||
|
||||
if (k->is_pressed() && (rich_text_label->has_focus() || is_a_parent_of(get_focus_owner()))) {
|
||||
|
||||
bool accepted = true;
|
||||
|
||||
switch (k->get_keycode()) {
|
||||
|
||||
case KEY_ESCAPE: {
|
||||
|
||||
_hide_bar();
|
||||
} break;
|
||||
default: {
|
||||
|
||||
accepted = false;
|
||||
} break;
|
||||
}
|
||||
@@ -1854,12 +1753,10 @@ void FindBar::_unhandled_input(const Ref<InputEvent> &p_event) {
|
||||
}
|
||||
|
||||
void FindBar::_search_text_changed(const String &p_text) {
|
||||
|
||||
search_next();
|
||||
}
|
||||
|
||||
void FindBar::_search_text_entered(const String &p_text) {
|
||||
|
||||
if (Input::get_singleton()->is_key_pressed(KEY_SHIFT)) {
|
||||
search_prev();
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user