1 files changed, 22 insertions, 9 deletions

diff --git a/scene/gui/tree.h b/scene/gui/tree.h
index f0819e2980..450943c048 100644
--- a/scene/gui/tree.h
+++ b/scene/gui/tree.h
@@ -245,7 +245,7 @@ public:
 
 	void add_button(int p_column, const Ref<Texture2D> &p_button, int p_id = -1, bool p_disabled = false, const String &p_tooltip = "");
 	int get_button_count(int p_column) const;
-	String get_button_tooltip(int p_column, int p_idx) const;
+	String get_button_tooltip_text(int p_column, int p_idx) const;
 	Ref<Texture2D> get_button(int p_column, int p_idx) const;
 	int get_button_id(int p_column, int p_idx) const;
 	void erase_button(int p_column, int p_idx);
@@ -308,8 +308,8 @@ public:
 	void set_custom_as_button(int p_column, bool p_button);
 	bool is_custom_set_as_button(int p_column) const;
 
-	void set_tooltip(int p_column, const String &p_tooltip);
-	String get_tooltip(int p_column) const;
+	void set_tooltip_text(int p_column, const String &p_tooltip);
+	String get_tooltip_text(int p_column) const;
 
 	void set_text_alignment(int p_column, HorizontalAlignment p_alignment);
 	HorizontalAlignment get_text_alignment(int p_column) const;
@@ -339,9 +339,16 @@ public:
 	TreeItem *get_child(int p_idx);
 	int get_visible_child_count();
 	int get_child_count();
-	Array get_children();
+	TypedArray<TreeItem> get_children();
 	int get_index();
 
+#ifdef DEV_ENABLED
+	// This debugging code can be removed once the current refactoring of this class is complete.
+	void validate_cache() const;
+#else
+	void validate_cache() const {}
+#endif
+
 	void move_before(TreeItem *p_item);
 	void move_after(TreeItem *p_item);
 
@@ -475,12 +482,15 @@ private:
 
 	void propagate_set_columns(TreeItem *p_item);
 
-	struct Cache {
+	struct ThemeCache {
+		Ref<StyleBox> panel_style;
+		Ref<StyleBox> focus_style;
+
 		Ref<Font> font;
 		Ref<Font> tb_font;
 		int font_size = 0;
 		int tb_font_size = 0;
-		Ref<StyleBox> bg;
+
 		Ref<StyleBox> selected;
 		Ref<StyleBox> selected_focus;
 		Ref<StyleBox> cursor;
@@ -498,8 +508,9 @@ private:
 		Ref<Texture2D> checked;
 		Ref<Texture2D> unchecked;
 		Ref<Texture2D> indeterminate;
-		Ref<Texture2D> arrow_collapsed;
 		Ref<Texture2D> arrow;
+		Ref<Texture2D> arrow_collapsed;
+		Ref<Texture2D> arrow_collapsed_mirrored;
 		Ref<Texture2D> select_arrow;
 		Ref<Texture2D> updown;
 
@@ -529,7 +540,9 @@ private:
 		int scroll_border = 0;
 		int scroll_speed = 0;
 		int font_outline_size = 0;
+	} theme_cache;
 
+	struct Cache {
 		enum ClickType {
 			CLICK_NONE,
 			CLICK_TITLE,
@@ -552,7 +565,6 @@ private:
 		Point2i text_editor_position;
 
 		bool rtl = false;
-
 	} cache;
 
 	int _get_title_button_height() const;
@@ -565,7 +577,6 @@ private:
 	bool v_scroll_enabled = true;
 
 	Size2 get_internal_min_size() const;
-	void update_cache();
 	void update_scrollbars();
 
 	Rect2 search_item_rect(TreeItem *p_from, TreeItem *p_item);
@@ -613,6 +624,8 @@ private:
 	bool _scroll(bool p_horizontal, float p_pages);
 
 protected:
+	virtual void _update_theme_item_cache() override;
+
 	static void _bind_methods();
 
 public: