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

Merge pull request #59464 from timothyqiu/update-layer-names-3.x

This commit is contained in:
Rémi Verschelde 2022-03-24 12:25:38 +01:00 committed by GitHub
parent 788abafb77 91b6c287d9
commit c08e753ef6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
editor/editor_properties.cpp
View File

@ -952,6 +952,8 @@ void EditorPropertyLayers::update_property() {
}
void EditorPropertyLayers::setup(LayerType p_layer_type) {
layer_type = p_layer_type;
String basename;
int layer_group_size = 0;
int layer_count = 0;
@ -1036,10 +1038,15 @@ void EditorPropertyLayers::_menu_pressed(int p_menu) {
_grid_changed(grid->value);
}
void EditorPropertyLayers::_refresh_names() {
setup(layer_type);
}
void EditorPropertyLayers::_bind_methods() {
ClassDB::bind_method(D_METHOD("_grid_changed"), &EditorPropertyLayers::_grid_changed);
ClassDB::bind_method(D_METHOD("_button_pressed"), &EditorPropertyLayers::_button_pressed);
ClassDB::bind_method(D_METHOD("_menu_pressed"), &EditorPropertyLayers::_menu_pressed);
ClassDB::bind_method(D_METHOD("_refresh_names"), &EditorPropertyLayers::_refresh_names);
}
EditorPropertyLayers::EditorPropertyLayers() {
@ -1064,6 +1071,8 @@ EditorPropertyLayers::EditorPropertyLayers() {
layers->set_hide_on_checkable_item_selection(false);
layers->connect("id_pressed", this, "_menu_pressed");
layers->connect("popup_hide", button, "set_pressed", varray(false));
ProjectSettings::get_singleton()->connect("project_settings_changed", this, "_refresh_names");
}
///////////////////// INT /////////////////////////

1
editor/editor_properties.h
View File

@ -269,6 +269,7 @@ private:
void _button_pressed();
void _menu_pressed(int p_menu);
void _refresh_names();
protected:
static void _bind_methods();