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

Merge pull request #44831 from gongpha/dont-update-tree-if-selected

Browse Source 
Blocking updating in SceneTreeEditor when an item was selected
This commit is contained in:
Rémi Verschelde 2021-05-06 08:45:41 +02:00 committed by GitHub
commit 605e33cf39
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editor/scene_tree_editor.cpp
View File

@ -540,6 +540,10 @@ void SceneTreeEditor::_update_tree(bool p_scroll_to_selected) {
return; return;
} }
if (tree->is_editing()) {
return;
}
updating_tree = true; updating_tree = true;
tree->clear(); tree->clear();
if (get_scene_node()) { if (get_scene_node()) {

4
scene/gui/tree.cpp
View File

@ -3013,6 +3013,10 @@ bool Tree::edit_selected() {
return false; return false;
} }
bool Tree::is_editing() {
return popup_editor->is_visible();
}
Size2 Tree::get_internal_min_size() const { Size2 Tree::get_internal_min_size() const {
Size2i size = cache.bg->get_offset(); Size2i size = cache.bg->get_offset();
if (root) { if (root) {

1
scene/gui/tree.h
View File

@ -604,6 +604,7 @@ public:
int get_item_offset(TreeItem *p_item) const; int get_item_offset(TreeItem *p_item) const;
Rect2 get_item_rect(TreeItem *p_item, int p_column = -1) const; Rect2 get_item_rect(TreeItem *p_item, int p_column = -1) const;
bool edit_selected(); bool edit_selected();
bool is_editing();
// First item that starts with the text, from the current focused item down and wraps around. // First item that starts with the text, from the current focused item down and wraps around.
TreeItem *search_item_text(const String &p_find, int *r_col = nullptr, bool p_selectable = false); TreeItem *search_item_text(const String &p_find, int *r_col = nullptr, bool p_selectable = false);