noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #115151 from YeldhamDev/multi_node_theme_fix

Browse Source 
Fix theme properties not being handled correctly by `MultiNodeEdit`
This commit is contained in:
Thaddeus Crews
2026-04-13 15:52:18 -05:00
parent e15961f681 0f640e1e3f
commit 8fd7cdac7e
3 changed files with 52 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
editor/debugger/editor_debugger_inspector.cpp
+21 -2
View File
@@ -233,8 +233,27 @@ EditorDebuggerRemoteObjects *EditorDebuggerInspector::set_objects(const Array &p
usage[pinfo.name] = usage_dt;
}
// Make sure only properties with the same exact PropertyInfo data will appear.
if (usage[pinfo.name].prop.first == pinfo) {
// Make sure only properties with matching PropertyInfo data will appear.
if (usage[pinfo.name].prop.first.name == pinfo.name &&
usage[pinfo.name].prop.first.type == pinfo.type &&
usage[pinfo.name].prop.first.class_name == pinfo.class_name &&
usage[pinfo.name].prop.first.hint == pinfo.hint &&
usage[pinfo.name].prop.first.hint_string == pinfo.hint_string) {
if (usage[pinfo.name].prop.first.usage != pinfo.usage) {
// Checkable properties (mostly theme items) need special treatment.
if (usage[pinfo.name].prop.first.usage & PROPERTY_USAGE_CHECKABLE && pinfo.usage & PROPERTY_USAGE_CHECKABLE) {
if (usage[pinfo.name].prop.first.usage & PROPERTY_USAGE_CHECKED) {
pinfo.usage |= PROPERTY_USAGE_STORAGE | PROPERTY_USAGE_CHECKED;
} else {
pinfo.usage &= ~(PROPERTY_USAGE_STORAGE | PROPERTY_USAGE_CHECKED);
}
if (usage[pinfo.name].prop.first.usage != pinfo.usage) {
continue;
}
}
}
usage[pinfo.name].qty++;
usage[pinfo.name].values[obj.id] = prop.second;
}
editor/inspector/editor_inspector.cpp
+10
View File
@@ -787,7 +787,17 @@ StringName EditorProperty::get_edited_property() const {
Variant EditorProperty::get_edited_property_display_value() const {
ERR_FAIL_NULL_V(object, Variant());
Control *control = Object::cast_to<Control>(object);
if (!control) {
MultiNodeEdit *multi = Object::cast_to<MultiNodeEdit>(object);
if (multi) {
Node *root = EditorNode::get_singleton()->get_edited_scene();
NodePath np = multi->get_node(0);
control = Object::cast_to<Control>(root->get_node_or_null(np));
}
}
// If checked but it's empty, it means that the set value has just been undone, and should show the default value as well.
if (control && checkable && (!checked || get_edited_property_value() == Variant()) && String(property).begins_with("theme_override_")) {
return control->get_used_theme_item(property);
editor/inspector/multi_node_edit.cpp
+21 -2
View File
@@ -189,8 +189,27 @@ void MultiNodeEdit::_get_property_list(List<PropertyInfo> *p_list) const {
data_list.push_back(usage_data);
}
// Make sure only properties with the same exact PropertyInfo data will appear.
if (usage_data->info == F) {
// Make sure only properties with matching PropertyInfo data will appear.
if (usage_data->info.name == F.name &&
usage_data->info.type == F.type &&
usage_data->info.class_name == F.class_name &&
usage_data->info.hint == F.hint &&
usage_data->info.hint_string == F.hint_string) {
if (usage_data->info.usage != F.usage) {
// Checkable properties (mostly theme items) need special treatment.
if (usage_data->info.usage & PROPERTY_USAGE_CHECKABLE && F.usage & PROPERTY_USAGE_CHECKABLE) {
if (usage_data->info.usage & PROPERTY_USAGE_CHECKED) {
F.usage |= PROPERTY_USAGE_STORAGE | PROPERTY_USAGE_CHECKED;
} else {
F.usage &= ~(PROPERTY_USAGE_STORAGE | PROPERTY_USAGE_CHECKED);
}
if (usage_data->info.usage != F.usage) {
continue;
}
}
}
usage_data->uses++;
}
}