1 files changed, 25 insertions, 28 deletions

diff --git a/scene/gui/option_button.cpp b/scene/gui/option_button.cpp
index 6488d6ce0a..a03d6d0cdc 100644
--- a/scene/gui/option_button.cpp
+++ b/scene/gui/option_button.cpp
@@ -29,18 +29,19 @@
 /*************************************************************************/
 
 #include "option_button.h"
+
 #include "core/print_string.h"
 
 Size2 OptionButton::get_minimum_size() const {
 
 	Size2 minsize = Button::get_minimum_size();
 
-	if (has_icon("arrow")) {
-		const Size2 padding = get_stylebox("normal")->get_minimum_size();
-		const Size2 arrow_size = Control::get_icon("arrow")->get_size();
+	if (has_theme_icon("arrow")) {
+		const Size2 padding = get_theme_stylebox("normal")->get_minimum_size();
+		const Size2 arrow_size = Control::get_theme_icon("arrow")->get_size();
 
 		Size2 content_size = minsize - padding;
-		content_size.width += arrow_size.width + get_constant("hseparation");
+		content_size.width += arrow_size.width + get_theme_constant("hseparation");
 		content_size.height = MAX(content_size.height, arrow_size.height);
 
 		minsize = content_size + padding;
@@ -54,37 +55,37 @@ void OptionButton::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_DRAW: {
 
-			if (!has_icon("arrow"))
+			if (!has_theme_icon("arrow"))
 				return;
 
 			RID ci = get_canvas_item();
-			Ref<Texture2D> arrow = Control::get_icon("arrow");
+			Ref<Texture2D> arrow = Control::get_theme_icon("arrow");
 			Color clr = Color(1, 1, 1);
-			if (get_constant("modulate_arrow")) {
+			if (get_theme_constant("modulate_arrow")) {
 				switch (get_draw_mode()) {
 					case DRAW_PRESSED:
-						clr = get_color("font_color_pressed");
+						clr = get_theme_color("font_color_pressed");
 						break;
 					case DRAW_HOVER:
-						clr = get_color("font_color_hover");
+						clr = get_theme_color("font_color_hover");
 						break;
 					case DRAW_DISABLED:
-						clr = get_color("font_color_disabled");
+						clr = get_theme_color("font_color_disabled");
 						break;
 					default:
-						clr = get_color("font_color");
+						clr = get_theme_color("font_color");
 				}
 			}
 
 			Size2 size = get_size();
 
-			Point2 ofs(size.width - arrow->get_width() - get_constant("arrow_margin"), int(Math::abs((size.height - arrow->get_height()) / 2)));
+			Point2 ofs(size.width - arrow->get_width() - get_theme_constant("arrow_margin"), int(Math::abs((size.height - arrow->get_height()) / 2)));
 			arrow->draw(ci, ofs, clr);
 		} break;
 		case NOTIFICATION_THEME_CHANGED: {
 
-			if (has_icon("arrow")) {
-				_set_internal_margin(MARGIN_RIGHT, Control::get_icon("arrow")->get_width());
+			if (has_theme_icon("arrow")) {
+				_set_internal_margin(MARGIN_RIGHT, Control::get_theme_icon("arrow")->get_width());
 			}
 		} break;
 		case NOTIFICATION_VISIBILITY_CHANGED: {
@@ -108,9 +109,8 @@ void OptionButton::_selected(int p_which) {
 void OptionButton::pressed() {
 
 	Size2 size = get_size();
-	popup->set_global_position(get_global_position() + Size2(0, size.height * get_global_transform().get_scale().y));
+	popup->set_position(get_screen_position() + Size2(0, size.height * get_global_transform().get_scale().y));
 	popup->set_size(Size2(size.width, 0));
-	popup->set_scale(get_global_transform().get_scale());
 	popup->popup();
 }
 
@@ -309,9 +309,6 @@ void OptionButton::get_translatable_strings(List<String> *p_strings) const {
 
 void OptionButton::_bind_methods() {
 
-	ClassDB::bind_method(D_METHOD("_selected"), &OptionButton::_selected);
-	ClassDB::bind_method(D_METHOD("_focused"), &OptionButton::_focused);
-
 	ClassDB::bind_method(D_METHOD("add_item", "label", "id"), &OptionButton::add_item, DEFVAL(-1));
 	ClassDB::bind_method(D_METHOD("add_icon_item", "texture", "label", "id"), &OptionButton::add_icon_item, DEFVAL(-1));
 	ClassDB::bind_method(D_METHOD("set_item_text", "idx", "text"), &OptionButton::set_item_text);
@@ -343,8 +340,8 @@ void OptionButton::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "items", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL), "_set_items", "_get_items");
 	// "selected" property must come after "items", otherwise GH-10213 occurs.
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "selected"), "_select_int", "get_selected");
-	ADD_SIGNAL(MethodInfo("item_selected", PropertyInfo(Variant::INT, "id")));
-	ADD_SIGNAL(MethodInfo("item_focused", PropertyInfo(Variant::INT, "id")));
+	ADD_SIGNAL(MethodInfo("item_selected", PropertyInfo(Variant::INT, "index")));
+	ADD_SIGNAL(MethodInfo("item_focused", PropertyInfo(Variant::INT, "index")));
 }
 
 OptionButton::OptionButton() {
@@ -353,19 +350,19 @@ OptionButton::OptionButton() {
 	set_toggle_mode(true);
 	set_text_align(ALIGN_LEFT);
 	set_action_mode(ACTION_MODE_BUTTON_PRESS);
-	if (has_icon("arrow")) {
-		_set_internal_margin(MARGIN_RIGHT, Control::get_icon("arrow")->get_width());
+	if (has_theme_icon("arrow")) {
+		_set_internal_margin(MARGIN_RIGHT, Control::get_theme_icon("arrow")->get_width());
 	}
 
 	popup = memnew(PopupMenu);
 	popup->hide();
 	add_child(popup);
-	popup->set_pass_on_modal_close_click(false);
-	popup->set_notify_transform(true);
+	//	popup->set_pass_on_modal_close_click(false);
+	//	popup->set_notify_transform(true);
 	popup->set_allow_search(true);
-	popup->connect_compat("index_pressed", this, "_selected");
-	popup->connect_compat("id_focused", this, "_focused");
-	popup->connect_compat("popup_hide", this, "set_pressed", varray(false));
+	popup->connect("index_pressed", callable_mp(this, &OptionButton::_selected));
+	popup->connect("id_focused", callable_mp(this, &OptionButton::_focused));
+	popup->connect("popup_hide", callable_mp((BaseButton *)this, &BaseButton::set_pressed), varray(false));
 }
 
 OptionButton::~OptionButton() {