Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-31 13:41:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed changing enabled classes resetting folding in manage editor features.

Browse source 
(cherry picked from commit 0f9913ce33)
This commit is contained in:
Emre Aydin 2021-05-27 17:19:33 +03:00 • committed by Rémi Verschelde
parent d71077f463
commit a6ff17c0a6
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 43 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

37
editor/editor_feature_profile.cpp
View file

@ -116,6 +116,18 @@ bool EditorFeatureProfile::has_class_properties_disabled(const StringName &p_cla
return disabled_properties.has(p_class); return disabled_properties.has(p_class);
} }
void EditorFeatureProfile::set_item_collapsed(const StringName &p_class, bool p_collapsed) {
if (p_collapsed) {
collapsed_classes.insert(p_class);
} else {
collapsed_classes.erase(p_class);
}
}
bool EditorFeatureProfile::is_item_collapsed(const StringName &p_class) const {
return collapsed_classes.has(p_class);
}
void EditorFeatureProfile::set_disable_feature(Feature p_feature, bool p_disable) { void EditorFeatureProfile::set_disable_feature(Feature p_feature, bool p_disable) {
ERR_FAIL_INDEX(p_feature, FEATURE_MAX); ERR_FAIL_INDEX(p_feature, FEATURE_MAX);
features_disabled[p_feature] = p_disable; features_disabled[p_feature] = p_disable;
@ -478,6 +490,9 @@ void EditorFeatureProfileManager::_fill_classes_from(TreeItem *p_parent, const S
class_item->set_selectable(0, true); class_item->set_selectable(0, true);
class_item->set_metadata(0, p_class); class_item->set_metadata(0, p_class);
bool collapsed = edited->is_item_collapsed(p_class);
class_item->set_collapsed(collapsed);
if (p_class == p_selected) { if (p_class == p_selected) {
class_item->select(0); class_item->select(0);
} }
@ -590,6 +605,26 @@ void EditorFeatureProfileManager::_class_list_item_edited() {
} }
} }
void EditorFeatureProfileManager::_class_list_item_collapsed(Object *p_item) {
if (updating_features) {
return;
}
TreeItem *item = Object::cast_to<TreeItem>(p_item);
if (!item) {
return;
}
Variant md = item->get_metadata(0);
if (md.get_type() != Variant::STRING) {
return;
}
String class_name = md;
bool collapsed = item->is_collapsed();
edited->set_item_collapsed(class_name, collapsed);
}
void EditorFeatureProfileManager::_property_item_edited() { void EditorFeatureProfileManager::_property_item_edited() {
if (updating_features) { if (updating_features) {
return; return;
@ -781,6 +816,7 @@ void EditorFeatureProfileManager::_bind_methods() {
ClassDB::bind_method("_export_profile", &EditorFeatureProfileManager::_export_profile); ClassDB::bind_method("_export_profile", &EditorFeatureProfileManager::_export_profile);
ClassDB::bind_method("_class_list_item_selected", &EditorFeatureProfileManager::_class_list_item_selected); ClassDB::bind_method("_class_list_item_selected", &EditorFeatureProfileManager::_class_list_item_selected);
ClassDB::bind_method("_class_list_item_edited", &EditorFeatureProfileManager::_class_list_item_edited); ClassDB::bind_method("_class_list_item_edited", &EditorFeatureProfileManager::_class_list_item_edited);
ClassDB::bind_method("_class_list_item_collapsed", &EditorFeatureProfileManager::_class_list_item_collapsed);
ClassDB::bind_method("_property_item_edited", &EditorFeatureProfileManager::_property_item_edited); ClassDB::bind_method("_property_item_edited", &EditorFeatureProfileManager::_property_item_edited);
ClassDB::bind_method("_emit_current_profile_changed", &EditorFeatureProfileManager::_emit_current_profile_changed); ClassDB::bind_method("_emit_current_profile_changed", &EditorFeatureProfileManager::_emit_current_profile_changed);
@ -852,6 +888,7 @@ EditorFeatureProfileManager::EditorFeatureProfileManager() {
class_list->set_edit_checkbox_cell_only_when_checkbox_is_pressed(true); class_list->set_edit_checkbox_cell_only_when_checkbox_is_pressed(true);
class_list->connect("cell_selected", this, "_class_list_item_selected"); class_list->connect("cell_selected", this, "_class_list_item_selected");
class_list->connect("item_edited", this, "_class_list_item_edited", varray(), CONNECT_DEFERRED); class_list->connect("item_edited", this, "_class_list_item_edited", varray(), CONNECT_DEFERRED);
class_list->connect("item_collapsed", this, "_class_list_item_collapsed");
VBoxContainer *property_list_vbc = memnew(VBoxContainer); VBoxContainer *property_list_vbc = memnew(VBoxContainer);
h_split->add_child(property_list_vbc); h_split->add_child(property_list_vbc);

6
editor/editor_feature_profile.h
View file

@ -60,6 +60,8 @@ private:
Set<StringName> disabled_editors; Set<StringName> disabled_editors;
Map<StringName, Set<StringName>> disabled_properties; Map<StringName, Set<StringName>> disabled_properties;
Set<StringName> collapsed_classes;
bool features_disabled[FEATURE_MAX]; bool features_disabled[FEATURE_MAX];
static const char *feature_names[FEATURE_MAX]; static const char *feature_names[FEATURE_MAX];
static const char *feature_identifiers[FEATURE_MAX]; static const char *feature_identifiers[FEATURE_MAX];
@ -80,6 +82,9 @@ public:
bool is_class_property_disabled(const StringName &p_class, const StringName &p_property) const; bool is_class_property_disabled(const StringName &p_class, const StringName &p_property) const;
bool has_class_properties_disabled(const StringName &p_class) const; bool has_class_properties_disabled(const StringName &p_class) const;
void set_item_collapsed(const StringName &p_class, bool p_collapsed);
bool is_item_collapsed(const StringName &p_class) const;
void set_disable_feature(Feature p_feature, bool p_disable); void set_disable_feature(Feature p_feature, bool p_disable);
bool is_feature_disabled(Feature p_feature) const; bool is_feature_disabled(Feature p_feature) const;
@ -148,6 +153,7 @@ class EditorFeatureProfileManager : public AcceptDialog {
void _class_list_item_selected(); void _class_list_item_selected();
void _class_list_item_edited(); void _class_list_item_edited();
void _class_list_item_collapsed(Object *p_item);
void _property_item_edited(); void _property_item_edited();
void _save_and_update(); void _save_and_update();