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

Don't show a copy of the property's name in the inspector's tooltip if there's no description 

(cherry picked from commit 28d3f85e64)
This commit is contained in:
Michael Alexsander 2020-02-26 00:22:18 -03:00 committed by Rémi Verschelde
parent e92669654a
commit 6e4aa5a580
2 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
editor/connections_dialog.cpp
View File

@ -500,7 +500,6 @@ Control *ConnectionsDockTree::make_custom_tooltip(const String &p_text) const {
String text = TTR("Signal:") + " [u][b]" + p_text.get_slice("::", 0) + "[/b][/u]"; String text = TTR("Signal:") + " [u][b]" + p_text.get_slice("::", 0) + "[/b][/u]";
text += p_text.get_slice("::", 1).strip_edges() + "\n"; text += p_text.get_slice("::", 1).strip_edges() + "\n";
text += p_text.get_slice("::", 2).strip_edges(); text += p_text.get_slice("::", 2).strip_edges();
help_bit->set_text(text);
help_bit->call_deferred("set_text", text); //hack so it uses proper theme once inside scene help_bit->call_deferred("set_text", text); //hack so it uses proper theme once inside scene
return help_bit; return help_bit;
} }

32
editor/editor_inspector.cpp
View File

@ -778,10 +778,20 @@ Control *EditorProperty::make_custom_tooltip(const String &p_text) const {
help_bit->add_style_override("panel", get_stylebox("panel", "TooltipPanel")); help_bit->add_style_override("panel", get_stylebox("panel", "TooltipPanel"));
help_bit->get_rich_text()->set_fixed_size_to_width(360 * EDSCALE); help_bit->get_rich_text()->set_fixed_size_to_width(360 * EDSCALE);
String text = TTR("Property:") + " [u][b]" + p_text.get_slice("::", 0) + "[/b][/u]\n"; Vector<String> slices = p_text.split("::", false);
text += p_text.get_slice("::", 1).strip_edges(); if (!slices.empty()) {
help_bit->set_text(text); String property_name = slices[0].strip_edges();
String text = TTR("Property:") + " [u][b]" + property_name + "[/b][/u]";
if (slices.size() > 1) {
String property_doc = slices[1].strip_edges();
if (property_name != property_doc) {
text += "\n" + property_doc;
}
}
help_bit->call_deferred("set_text", text); //hack so it uses proper theme once inside scene help_bit->call_deferred("set_text", text); //hack so it uses proper theme once inside scene
}
return help_bit; return help_bit;
} }
@ -1005,10 +1015,20 @@ Control *EditorInspectorCategory::make_custom_tooltip(const String &p_text) cons
help_bit->add_style_override("panel", get_stylebox("panel", "TooltipPanel")); help_bit->add_style_override("panel", get_stylebox("panel", "TooltipPanel"));
help_bit->get_rich_text()->set_fixed_size_to_width(360 * EDSCALE); help_bit->get_rich_text()->set_fixed_size_to_width(360 * EDSCALE);
String text = "[u][b]" + p_text.get_slice("::", 0) + "[/b][/u]\n"; Vector<String> slices = p_text.split("::", false);
text += p_text.get_slice("::", 1).strip_edges(); if (!slices.empty()) {
help_bit->set_text(text); String property_name = slices[0].strip_edges();
String text = "[u][b]" + property_name + "[/b][/u]";
if (slices.size() > 1) {
String property_doc = slices[1].strip_edges();
if (property_name != property_doc) {
text += "\n" + property_doc;
}
}
help_bit->call_deferred("set_text", text); //hack so it uses proper theme once inside scene help_bit->call_deferred("set_text", text); //hack so it uses proper theme once inside scene
}
return help_bit; return help_bit;
} }