1 files changed, 28 insertions, 15 deletions

diff --git a/scene/gui/tabs.cpp b/scene/gui/tabs.cpp
index b114264de1..2075f7ce70 100644
--- a/scene/gui/tabs.cpp
+++ b/scene/gui/tabs.cpp
@@ -189,7 +189,7 @@ void Tabs::_gui_input(const Ref<InputEvent> &p_event) {
 			update();
 		}
 
-		if (mb->is_pressed() && mb->get_button_index() == BUTTON_LEFT) {
+		if (mb->is_pressed() && (mb->get_button_index() == BUTTON_LEFT || (select_with_rmb && mb->get_button_index() == BUTTON_RIGHT))) {
 
 			// clicks
 			Point2 pos(mb->get_position().x, mb->get_position().y);
@@ -286,7 +286,7 @@ void Tabs::_notification(int p_what) {
 
 			for (int i = 0; i < tabs.size(); i++) {
 
-				tabs[i].ofs_cache = mw;
+				tabs.write[i].ofs_cache = mw;
 				mw += get_tab_width(i);
 			}
 
@@ -314,7 +314,7 @@ void Tabs::_notification(int p_what) {
 				if (i < offset)
 					continue;
 
-				tabs[i].ofs_cache = w;
+				tabs.write[i].ofs_cache = w;
 
 				int lsize = tabs[i].size_cache;
 
@@ -379,7 +379,7 @@ void Tabs::_notification(int p_what) {
 
 					rb->draw(ci, Point2i(w + style->get_margin(MARGIN_LEFT), rb_rect.position.y + style->get_margin(MARGIN_TOP)));
 					w += rb->get_width();
-					tabs[i].rb_rect = rb_rect;
+					tabs.write[i].rb_rect = rb_rect;
 				}
 
 				if (cb_displaypolicy == CLOSE_BUTTON_SHOW_ALWAYS || (cb_displaypolicy == CLOSE_BUTTON_SHOW_ACTIVE_ONLY && i == current)) {
@@ -403,7 +403,7 @@ void Tabs::_notification(int p_what) {
 
 					cb->draw(ci, Point2i(w + style->get_margin(MARGIN_LEFT), cb_rect.position.y + style->get_margin(MARGIN_TOP)));
 					w += cb->get_width();
-					tabs[i].cb_rect = cb_rect;
+					tabs.write[i].cb_rect = cb_rect;
 				}
 
 				w += sb->get_margin(MARGIN_RIGHT);
@@ -471,7 +471,7 @@ bool Tabs::get_offset_buttons_visible() const {
 void Tabs::set_tab_title(int p_tab, const String &p_title) {
 
 	ERR_FAIL_INDEX(p_tab, tabs.size());
-	tabs[p_tab].text = p_title;
+	tabs.write[p_tab].text = p_title;
 	update();
 	minimum_size_changed();
 }
@@ -485,7 +485,7 @@ String Tabs::get_tab_title(int p_tab) const {
 void Tabs::set_tab_icon(int p_tab, const Ref<Texture> &p_icon) {
 
 	ERR_FAIL_INDEX(p_tab, tabs.size());
-	tabs[p_tab].icon = p_icon;
+	tabs.write[p_tab].icon = p_icon;
 	update();
 	minimum_size_changed();
 }
@@ -499,7 +499,7 @@ Ref<Texture> Tabs::get_tab_icon(int p_tab) const {
 void Tabs::set_tab_disabled(int p_tab, bool p_disabled) {
 
 	ERR_FAIL_INDEX(p_tab, tabs.size());
-	tabs[p_tab].disabled = p_disabled;
+	tabs.write[p_tab].disabled = p_disabled;
 	update();
 }
 bool Tabs::get_tab_disabled(int p_tab) const {
@@ -511,7 +511,7 @@ bool Tabs::get_tab_disabled(int p_tab) const {
 void Tabs::set_tab_right_button(int p_tab, const Ref<Texture> &p_right_button) {
 
 	ERR_FAIL_INDEX(p_tab, tabs.size());
-	tabs[p_tab].right_button = p_right_button;
+	tabs.write[p_tab].right_button = p_right_button;
 	_update_cache();
 	update();
 	minimum_size_changed();
@@ -536,9 +536,9 @@ void Tabs::_update_cache() {
 	int size_fixed = 0;
 	int count_resize = 0;
 	for (int i = 0; i < tabs.size(); i++) {
-		tabs[i].ofs_cache = mw;
-		tabs[i].size_cache = get_tab_width(i);
-		tabs[i].size_text = font->get_string_size(tabs[i].text).width;
+		tabs.write[i].ofs_cache = mw;
+		tabs.write[i].size_cache = get_tab_width(i);
+		tabs.write[i].size_text = font->get_string_size(tabs[i].text).width;
 		mw += tabs[i].size_cache;
 		if (tabs[i].size_cache <= min_width || i == current) {
 			size_fixed += tabs[i].size_cache;
@@ -579,9 +579,9 @@ void Tabs::_update_cache() {
 				lsize = m_width;
 			}
 		}
-		tabs[i].ofs_cache = w;
-		tabs[i].size_cache = lsize;
-		tabs[i].size_text = slen;
+		tabs.write[i].ofs_cache = w;
+		tabs.write[i].size_cache = lsize;
+		tabs.write[i].size_text = slen;
 		w += lsize;
 	}
 }
@@ -920,6 +920,14 @@ int Tabs::get_tabs_rearrange_group() const {
 	return tabs_rearrange_group;
 }
 
+void Tabs::set_select_with_rmb(bool p_enabled) {
+	select_with_rmb = p_enabled;
+}
+
+bool Tabs::get_select_with_rmb() const {
+	return select_with_rmb;
+}
+
 void Tabs::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("_gui_input"), &Tabs::_gui_input);
@@ -950,6 +958,9 @@ void Tabs::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_tabs_rearrange_group", "group_id"), &Tabs::set_tabs_rearrange_group);
 	ClassDB::bind_method(D_METHOD("get_tabs_rearrange_group"), &Tabs::get_tabs_rearrange_group);
 
+	ClassDB::bind_method(D_METHOD("set_select_with_rmb", "enabled"), &Tabs::set_select_with_rmb);
+	ClassDB::bind_method(D_METHOD("get_select_with_rmb"), &Tabs::get_select_with_rmb);
+
 	ADD_SIGNAL(MethodInfo("tab_changed", PropertyInfo(Variant::INT, "tab")));
 	ADD_SIGNAL(MethodInfo("right_button_pressed", PropertyInfo(Variant::INT, "tab")));
 	ADD_SIGNAL(MethodInfo("tab_close", PropertyInfo(Variant::INT, "tab")));
@@ -988,6 +999,8 @@ Tabs::Tabs() {
 	offset = 0;
 	max_drawn_tab = 0;
 
+	select_with_rmb = false;
+
 	min_width = 0;
 	scrolling_enabled = true;
 	buttons_visible = false;