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

Merge pull request #88731 from ajreckof/Removing-element-in-array-will-not-change-page-when-emptying-page- 

Fix removing element in array inspector not changing page when emptying page.
This commit is contained in:
Rémi Verschelde 2024-02-23 22:19:36 +01:00
parent 4ec8976fdd 4f2074ebd9
commit 2fe8f07b6c
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
editor/editor_properties_array_dict.cpp
View File

@ -211,7 +211,7 @@ void EditorPropertyArray::_property_changed(const String &p_property, Variant p_
void EditorPropertyArray::_change_type(Object *p_button, int p_slot_index) { void EditorPropertyArray::_change_type(Object *p_button, int p_slot_index) {
Button *button = Object::cast_to<Button>(p_button); Button *button = Object::cast_to<Button>(p_button);
changing_type_index = slots[p_slot_index].index; changing_type_index = p_slot_index;
Rect2 rect = button->get_screen_rect(); Rect2 rect = button->get_screen_rect();
change_type->reset_size(); change_type->reset_size();
change_type->set_position(rect.get_end() - Vector2(change_type->get_contents_minimum_size().x, 0)); change_type->set_position(rect.get_end() - Vector2(change_type->get_contents_minimum_size().x, 0));
@ -228,7 +228,7 @@ void EditorPropertyArray::_change_type_menu(int p_index) {
VariantInternal::initialize(&value, Variant::Type(p_index)); VariantInternal::initialize(&value, Variant::Type(p_index));
Variant array = object->get_array().duplicate(); Variant array = object->get_array().duplicate();
array.set(changing_type_index, value); array.set(slots[changing_type_index].index, value);
emit_changed(get_edited_property(), array, "", true); emit_changed(get_edited_property(), array, "", true);
update_property(); update_property();
@ -311,7 +311,9 @@ void EditorPropertyArray::update_property() {
int size = array.call("size"); int size = array.call("size");
int max_page = MAX(0, size - 1) / page_length; int max_page = MAX(0, size - 1) / page_length;
page_index = MIN(page_index, max_page); if (page_index > max_page) {
_page_changed(max_page);
}
edit->set_text(vformat(TTR("%s (size %s)"), array_type_name, itos(size))); edit->set_text(vformat(TTR("%s (size %s)"), array_type_name, itos(size)));