1 files changed, 47 insertions, 28 deletions

diff --git a/scene/gui/tabs.h b/scene/gui/tabs.h
index 8d7f1aa37d..86877f4d80 100644
--- a/scene/gui/tabs.h
+++ b/scene/gui/tabs.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       */
@@ -32,13 +32,13 @@
 #define TABS_H
 
 #include "scene/gui/control.h"
+#include "scene/resources/text_line.h"
 
 class Tabs : public Control {
 	GDCLASS(Tabs, Control);
 
 public:
 	enum TabAlign {
-
 		ALIGN_LEFT,
 		ALIGN_CENTER,
 		ALIGN_RIGHT,
@@ -46,7 +46,6 @@ public:
 	};
 
 	enum CloseButtonDisplayPolicy {
-
 		CLOSE_BUTTON_SHOW_NEVER,
 		CLOSE_BUTTON_SHOW_ACTIVE_ONLY,
 		CLOSE_BUTTON_SHOW_ALWAYS,
@@ -57,42 +56,49 @@ private:
 	struct Tab {
 		String text;
 		String xl_text;
+
+		Dictionary opentype_features;
+		String language;
+		Control::TextDirection text_direction = Control::TEXT_DIRECTION_INHERITED;
+
+		Ref<TextLine> text_buf;
 		Ref<Texture2D> icon;
-		int ofs_cache;
-		bool disabled;
-		int size_cache;
-		int size_text;
-		int x_cache;
-		int x_size_cache;
+		int ofs_cache = 0;
+		bool disabled = false;
+		int size_cache = 0;
+		int size_text = 0;
+		int x_cache = 0;
+		int x_size_cache = 0;
 
 		Ref<Texture2D> right_button;
 		Rect2 rb_rect;
 		Rect2 cb_rect;
 	};
 
-	int offset;
-	int max_drawn_tab;
-	int highlight_arrow;
-	bool buttons_visible;
-	bool missing_right;
+	int offset = 0;
+	int max_drawn_tab = 0;
+	int highlight_arrow = -1;
+	bool buttons_visible = false;
+	bool missing_right = false;
 	Vector<Tab> tabs;
-	int current;
+	int current = 0;
+	int previous = 0;
 	int _get_top_margin() const;
-	TabAlign tab_align;
-	int rb_hover;
-	bool rb_pressing;
+	TabAlign tab_align = ALIGN_CENTER;
+	int rb_hover = -1;
+	bool rb_pressing = false;
 
-	bool select_with_rmb;
+	bool select_with_rmb = false;
 
-	int cb_hover;
-	bool cb_pressing;
-	CloseButtonDisplayPolicy cb_displaypolicy;
+	int cb_hover = -1;
+	bool cb_pressing = false;
+	CloseButtonDisplayPolicy cb_displaypolicy = CLOSE_BUTTON_SHOW_NEVER;
 
-	int hover; // Hovered tab.
-	int min_width;
-	bool scrolling_enabled;
-	bool drag_to_rearrange_enabled;
-	int tabs_rearrange_group;
+	int hover = -1; // Hovered tab.
+	int min_width = 0;
+	bool scrolling_enabled = true;
+	bool drag_to_rearrange_enabled = false;
+	int tabs_rearrange_group = -1;
 
 	int get_tab_width(int p_idx) const;
 	void _ensure_no_over_offset();
@@ -102,6 +108,8 @@ private:
 
 	void _on_mouse_exited();
 
+	void _shape(int p_tab);
+
 protected:
 	void _gui_input(const Ref<InputEvent> &p_event);
 	void _notification(int p_what);
@@ -118,6 +126,16 @@ public:
 	void set_tab_title(int p_tab, const String &p_title);
 	String get_tab_title(int p_tab) const;
 
+	void set_tab_text_direction(int p_tab, TextDirection p_text_direction);
+	TextDirection get_tab_text_direction(int p_tab) const;
+
+	void set_tab_opentype_feature(int p_tab, const String &p_name, int p_value);
+	int get_tab_opentype_feature(int p_tab, const String &p_name) const;
+	void clear_tab_opentype_features(int p_tab);
+
+	void set_tab_language(int p_tab, const String &p_language);
+	String get_tab_language(int p_tab) const;
+
 	void set_tab_icon(int p_tab, const Ref<Texture2D> &p_icon);
 	Ref<Texture2D> get_tab_icon(int p_tab) const;
 
@@ -138,6 +156,7 @@ public:
 	int get_tab_count() const;
 	void set_current_tab(int p_current);
 	int get_current_tab() const;
+	int get_previous_tab() const;
 	int get_hovered_tab() const;
 
 	int get_tab_offset() const;