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

Merge pull request #60623 from timothyqiu/sv-usage

Browse Source
This commit is contained in:
Rémi Verschelde 2022-04-29 13:48:51 +02:00 committed by GitHub
commit 700ca5bb3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
editor/editor_inspector.cpp
View File

@ -2456,8 +2456,6 @@ void EditorInspector::update_tree() {
_parse_added_editors(main_vbox, ped); _parse_added_editors(main_vbox, ped);
} }
bool in_script_variables = false;
// Get the lists of editors for properties. // Get the lists of editors for properties.
for (List<PropertyInfo>::Element *E_property = plist.front(); E_property; E_property = E_property->next()) { for (List<PropertyInfo>::Element *E_property = plist.front(); E_property; E_property = E_property->next()) {
PropertyInfo &p = E_property->get(); PropertyInfo &p = E_property->get();
@ -2549,9 +2547,6 @@ void EditorInspector::update_tree() {
if (category->icon.is_null() && has_theme_icon(base_type, SNAME("EditorIcons"))) { if (category->icon.is_null() && has_theme_icon(base_type, SNAME("EditorIcons"))) {
category->icon = get_theme_icon(base_type, SNAME("EditorIcons")); category->icon = get_theme_icon(base_type, SNAME("EditorIcons"));
} }
in_script_variables = true;
} else {
in_script_variables = false;
} }
if (category->icon.is_null()) { if (category->icon.is_null()) {
if (!type.is_empty()) { // Can happen for built-in scripts. if (!type.is_empty()) { // Can happen for built-in scripts.
@ -2687,9 +2682,9 @@ void EditorInspector::update_tree() {
} }
} }
// Don't localize properties in Script Variables category. // Don't localize script variables.
EditorPropertyNameProcessor::Style name_style = property_name_style; EditorPropertyNameProcessor::Style name_style = property_name_style;
if (in_script_variables && name_style == EditorPropertyNameProcessor::STYLE_LOCALIZED) { if ((p.usage & PROPERTY_USAGE_SCRIPT_VARIABLE) && name_style == EditorPropertyNameProcessor::STYLE_LOCALIZED) {
name_style = EditorPropertyNameProcessor::STYLE_CAPITALIZED; name_style = EditorPropertyNameProcessor::STYLE_CAPITALIZED;
} }
const String property_label_string = EditorPropertyNameProcessor::get_singleton()->process_name(name_override, name_style) + feature_tag; const String property_label_string = EditorPropertyNameProcessor::get_singleton()->process_name(name_override, name_style) + feature_tag;
@ -2745,9 +2740,15 @@ void EditorInspector::update_tree() {
String label; String label;
String tooltip; String tooltip;
// Don't localize groups for script variables.
EditorPropertyNameProcessor::Style section_name_style = property_name_style;
if ((p.usage & PROPERTY_USAGE_SCRIPT_VARIABLE) && section_name_style == EditorPropertyNameProcessor::STYLE_LOCALIZED) {
section_name_style = EditorPropertyNameProcessor::STYLE_CAPITALIZED;
}
// Only process group label if this is not the group or subgroup. // Only process group label if this is not the group or subgroup.
if ((i == 0 && component == group) || (i == 1 && component == subgroup)) { if ((i == 0 && component == group) || (i == 1 && component == subgroup)) {
if (property_name_style == EditorPropertyNameProcessor::STYLE_LOCALIZED) { if (section_name_style == EditorPropertyNameProcessor::STYLE_LOCALIZED) {
label = TTRGET(component); label = TTRGET(component);
tooltip = component; tooltip = component;
} else { } else {
@ -2755,8 +2756,8 @@ void EditorInspector::update_tree() {
tooltip = TTRGET(component); tooltip = TTRGET(component);
} }
} else { } else {
label = EditorPropertyNameProcessor::get_singleton()->process_name(component, property_name_style); label = EditorPropertyNameProcessor::get_singleton()->process_name(component, section_name_style);
tooltip = EditorPropertyNameProcessor::get_singleton()->process_name(component, EditorPropertyNameProcessor::get_tooltip_style(property_name_style)); tooltip = EditorPropertyNameProcessor::get_singleton()->process_name(component, EditorPropertyNameProcessor::get_tooltip_style(section_name_style));
} }
Color c = sscolor; Color c = sscolor;