From 221051d5234d386d512c759c8e4111ddddbbe254 Mon Sep 17 00:00:00 2001 From: Giuliano Barberi Date: Sat, 6 Jun 2020 17:02:22 -0400 Subject: [PATCH] Tree: Calling update in _gui_input less frequently (cherry picked from commit d443a13244093a3b094dc52b197f9abb363bdfee) --- scene/gui/tree.cpp | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp index 4e5804f1b98..6428da65be1 100644 --- a/scene/gui/tree.cpp +++ b/scene/gui/tree.cpp @@ -2475,7 +2475,6 @@ void Tree::_gui_input(Ref p_event) { cache.hover_type = Cache::CLICK_TITLE; cache.hover_index = i; - update(); break; } } @@ -2494,6 +2493,9 @@ void Tree::_gui_input(Ref p_event) { if (v_scroll->is_visible_in_tree()) mpos.y += v_scroll->get_value(); + TreeItem *old_it = cache.hover_item; + int old_col = cache.hover_cell; + int col, h, section; TreeItem *it = _find_item_at_pos(root, mpos, col, h, section); @@ -2508,18 +2510,21 @@ void Tree::_gui_input(Ref p_event) { } } - if (it != cache.hover_item) { - cache.hover_item = it; - update(); - } + cache.hover_item = it; + cache.hover_cell = col; - if (it && col != cache.hover_cell) { - cache.hover_cell = col; - update(); + if (it != old_it || col != old_col) { + // Only need to update if mouse enters/exits a button + bool was_over_button = old_it && old_it->cells[old_col].custom_button; + bool is_over_button = it && it->cells[col].custom_button; + if (was_over_button || is_over_button) { + update(); + } } } } + // Update if mouse enters/exits columns if (cache.hover_type != old_hover || cache.hover_index != old_index) { update(); }