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

Merge pull request #76910 from AThousandShips/inspector_fix 

Make `EditorPropertyNameProcessor` check `EditorSettings` validity
This commit is contained in:
Rémi Verschelde 2023-05-10 14:19:15 +02:00
parent 104de1a750 6cd9d72abe
commit 4e1d5be9d3
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
editor/editor_property_name_processor.cpp
View File

@ -36,6 +36,9 @@
EditorPropertyNameProcessor *EditorPropertyNameProcessor::singleton = nullptr; EditorPropertyNameProcessor *EditorPropertyNameProcessor::singleton = nullptr;
EditorPropertyNameProcessor::Style EditorPropertyNameProcessor::get_default_inspector_style() { EditorPropertyNameProcessor::Style EditorPropertyNameProcessor::get_default_inspector_style() {
if (!EditorSettings::get_singleton()) {
return STYLE_CAPITALIZED;
}
const Style style = (Style)EDITOR_GET("interface/inspector/default_property_name_style").operator int(); const Style style = (Style)EDITOR_GET("interface/inspector/default_property_name_style").operator int();
if (style == STYLE_LOCALIZED && !is_localization_available()) { if (style == STYLE_LOCALIZED && !is_localization_available()) {
return STYLE_CAPITALIZED; return STYLE_CAPITALIZED;
@ -44,6 +47,9 @@ EditorPropertyNameProcessor::Style EditorPropertyNameProcessor::get_default_insp
} }
EditorPropertyNameProcessor::Style EditorPropertyNameProcessor::get_settings_style() { EditorPropertyNameProcessor::Style EditorPropertyNameProcessor::get_settings_style() {
if (!EditorSettings::get_singleton()) {
return STYLE_LOCALIZED;
}
const bool translate = EDITOR_GET("interface/editor/localize_settings"); const bool translate = EDITOR_GET("interface/editor/localize_settings");
return translate ? STYLE_LOCALIZED : STYLE_CAPITALIZED; return translate ? STYLE_LOCALIZED : STYLE_CAPITALIZED;
} }
@ -53,6 +59,9 @@ EditorPropertyNameProcessor::Style EditorPropertyNameProcessor::get_tooltip_styl
} }
bool EditorPropertyNameProcessor::is_localization_available() { bool EditorPropertyNameProcessor::is_localization_available() {
if (!EditorSettings::get_singleton()) {
return false;
}
const Vector<String> forbidden = String("en").split(","); const Vector<String> forbidden = String("en").split(",");
return forbidden.find(EDITOR_GET("interface/editor/editor_language")) == -1; return forbidden.find(EDITOR_GET("interface/editor/editor_language")) == -1;
} }