1 files changed, 52 insertions, 31 deletions

diff --git a/scene/gui/item_list.h b/scene/gui/item_list.h
index 4cdef40184..8a234398c3 100644
--- a/scene/gui/item_list.h
+++ b/scene/gui/item_list.h
@@ -5,8 +5,8 @@
 /*                           GODOT ENGINE                                */
 /*                      https://godotengine.org                          */
 /*************************************************************************/
-/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md).   */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
@@ -33,6 +33,7 @@
 
 #include "scene/gui/control.h"
 #include "scene/gui/scroll_bar.h"
+#include "scene/resources/text_paragraph.h"
 
 class ItemList : public Control {
 	GDCLASS(ItemList, Control);
@@ -51,15 +52,20 @@ public:
 private:
 	struct Item {
 		Ref<Texture2D> icon;
-		bool icon_transposed;
+		bool icon_transposed = false;
 		Rect2i icon_region;
 		Color icon_modulate;
 		Ref<Texture2D> tag_icon;
 		String text;
-		bool selectable;
-		bool selected;
-		bool disabled;
-		bool tooltip_enabled;
+		Ref<TextParagraph> text_buf;
+		Dictionary opentype_features;
+		String language;
+		TextDirection text_direction = TEXT_DIRECTION_AUTO;
+
+		bool selectable = false;
+		bool selected = false;
+		bool disabled = false;
+		bool tooltip_enabled = false;
 		Variant metadata;
 		String tooltip;
 		Color custom_fg;
@@ -73,62 +79,74 @@ private:
 		bool operator<(const Item &p_another) const { return text < p_another.text; }
 	};
 
-	int current;
+	int current = -1;
 
-	bool shape_changed;
+	bool shape_changed = true;
 
-	bool ensure_selected_visible;
-	bool same_column_width;
+	bool ensure_selected_visible = false;
+	bool same_column_width = false;
 
-	bool auto_height;
-	float auto_height_value;
+	bool auto_height = false;
+	float auto_height_value = 0.0;
 
 	Vector<Item> items;
 	Vector<int> separators;
 
-	SelectMode select_mode;
-	IconMode icon_mode;
+	SelectMode select_mode = SELECT_SINGLE;
+	IconMode icon_mode = ICON_MODE_LEFT;
 	VScrollBar *scroll_bar;
+	TextParagraph::OverrunBehavior text_overrun_behavior = TextParagraph::OVERRUN_NO_TRIMMING;
 
-	uint64_t search_time_msec;
+	uint64_t search_time_msec = 0;
 	String search_string;
 
-	int current_columns;
-	int fixed_column_width;
-	int max_text_lines;
-	int max_columns;
+	int current_columns = 1;
+	int fixed_column_width = 0;
+	int max_text_lines = 1;
+	int max_columns = 1;
 
 	Size2 fixed_icon_size;
 
 	Size2 max_item_size_cache;
 
-	int defer_select_single;
+	int defer_select_single = -1;
 
-	bool allow_rmb_select;
+	bool allow_rmb_select = false;
 
-	bool allow_reselect;
+	bool allow_reselect = false;
 
-	real_t icon_scale;
+	real_t icon_scale = 1.0;
 
-	bool do_autoscroll_to_bottom;
+	bool do_autoscroll_to_bottom = false;
 
 	Array _get_items() const;
 	void _set_items(const Array &p_items);
 
 	void _scroll_changed(double);
 	void _gui_input(const Ref<InputEvent> &p_event);
+	void _shape(int p_idx);
 
 protected:
 	void _notification(int p_what);
 	static void _bind_methods();
 
 public:
-	void add_item(const String &p_item, const Ref<Texture2D> &p_texture = Ref<Texture2D>(), bool p_selectable = true);
-	void add_icon_item(const Ref<Texture2D> &p_item, bool p_selectable = true);
+	int add_item(const String &p_item, const Ref<Texture2D> &p_texture = Ref<Texture2D>(), bool p_selectable = true);
+	int add_icon_item(const Ref<Texture2D> &p_item, bool p_selectable = true);
 
 	void set_item_text(int p_idx, const String &p_text);
 	String get_item_text(int p_idx) const;
 
+	void set_item_text_direction(int p_idx, TextDirection p_text_direction);
+	TextDirection get_item_text_direction(int p_idx) const;
+
+	void set_item_opentype_feature(int p_idx, const String &p_name, int p_value);
+	int get_item_opentype_feature(int p_idx, const String &p_name) const;
+	void clear_item_opentype_features(int p_idx);
+
+	void set_item_language(int p_idx, const String &p_language);
+	String get_item_language(int p_idx) const;
+
 	void set_item_icon(int p_idx, const Ref<Texture2D> &p_icon);
 	Ref<Texture2D> get_item_icon(int p_idx) const;
 
@@ -165,9 +183,12 @@ public:
 	void set_item_custom_fg_color(int p_idx, const Color &p_custom_fg_color);
 	Color get_item_custom_fg_color(int p_idx) const;
 
+	void set_text_overrun_behavior(TextParagraph::OverrunBehavior p_behavior);
+	TextParagraph::OverrunBehavior get_text_overrun_behavior() const;
+
 	void select(int p_idx, bool p_single = true);
-	void unselect(int p_idx);
-	void unselect_all();
+	void deselect(int p_idx);
+	void deselect_all();
 	bool is_selected(int p_idx) const;
 	Vector<int> get_selected_items();
 	bool is_anything_selected();
@@ -214,7 +235,7 @@ public:
 	void sort_items_by_text();
 	int find_metadata(const Variant &p_metadata) const;
 
-	virtual String get_tooltip(const Point2 &p_pos) const;
+	virtual String get_tooltip(const Point2 &p_pos) const override;
 	int get_item_at_position(const Point2 &p_pos, bool p_exact = false) const;
 	bool is_pos_at_end_of_items(const Point2 &p_pos) const;
 
@@ -224,7 +245,7 @@ public:
 	void set_auto_height(bool p_enable);
 	bool has_auto_height() const;
 
-	Size2 get_minimum_size() const;
+	Size2 get_minimum_size() const override;
 
 	void set_autoscroll_to_bottom(const bool p_enable);