1 files changed, 24 insertions, 25 deletions

diff --git a/scene/gui/option_button.cpp b/scene/gui/option_button.cpp
index 4f274595a2..2adeb2d947 100644
--- a/scene/gui/option_button.cpp
+++ b/scene/gui/option_button.cpp
@@ -35,12 +35,12 @@
 Size2 OptionButton::get_minimum_size() const {
 	Size2 minsize = Button::get_minimum_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();
+	if (has_theme_icon(SNAME("arrow"))) {
+		const Size2 padding = get_theme_stylebox(SNAME("normal"))->get_minimum_size();
+		const Size2 arrow_size = Control::get_theme_icon(SNAME("arrow"))->get_size();
 
 		Size2 content_size = minsize - padding;
-		content_size.width += arrow_size.width + get_theme_constant("hseparation");
+		content_size.width += arrow_size.width + get_theme_constant(SNAME("hseparation"));
 		content_size.height = MAX(content_size.height, arrow_size.height);
 
 		minsize = content_size + padding;
@@ -52,26 +52,26 @@ Size2 OptionButton::get_minimum_size() const {
 void OptionButton::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_DRAW: {
-			if (!has_theme_icon("arrow")) {
+			if (!has_theme_icon(SNAME("arrow"))) {
 				return;
 			}
 
 			RID ci = get_canvas_item();
-			Ref<Texture2D> arrow = Control::get_theme_icon("arrow");
+			Ref<Texture2D> arrow = Control::get_theme_icon(SNAME("arrow"));
 			Color clr = Color(1, 1, 1);
-			if (get_theme_constant("modulate_arrow")) {
+			if (get_theme_constant(SNAME("modulate_arrow"))) {
 				switch (get_draw_mode()) {
 					case DRAW_PRESSED:
-						clr = get_theme_color("font_color_pressed");
+						clr = get_theme_color(SNAME("font_pressed_color"));
 						break;
 					case DRAW_HOVER:
-						clr = get_theme_color("font_color_hover");
+						clr = get_theme_color(SNAME("font_hover_color"));
 						break;
 					case DRAW_DISABLED:
-						clr = get_theme_color("font_color_disabled");
+						clr = get_theme_color(SNAME("font_disabled_color"));
 						break;
 					default:
-						clr = get_theme_color("font_color");
+						clr = get_theme_color(SNAME("font_color"));
 				}
 			}
 
@@ -79,22 +79,22 @@ void OptionButton::_notification(int p_what) {
 
 			Point2 ofs;
 			if (is_layout_rtl()) {
-				ofs = Point2(get_theme_constant("arrow_margin"), int(Math::abs((size.height - arrow->get_height()) / 2)));
+				ofs = Point2(get_theme_constant(SNAME("arrow_margin")), int(Math::abs((size.height - arrow->get_height()) / 2)));
 			} else {
-				ofs = Point2(size.width - arrow->get_width() - get_theme_constant("arrow_margin"), int(Math::abs((size.height - arrow->get_height()) / 2)));
+				ofs = Point2(size.width - arrow->get_width() - get_theme_constant(SNAME("arrow_margin")), int(Math::abs((size.height - arrow->get_height()) / 2)));
 			}
 			arrow->draw(ci, ofs, clr);
 		} break;
 		case NOTIFICATION_TRANSLATION_CHANGED:
 		case NOTIFICATION_LAYOUT_DIRECTION_CHANGED:
 		case NOTIFICATION_THEME_CHANGED: {
-			if (has_theme_icon("arrow")) {
+			if (has_theme_icon(SNAME("arrow"))) {
 				if (is_layout_rtl()) {
-					_set_internal_margin(SIDE_LEFT, Control::get_theme_icon("arrow")->get_width());
+					_set_internal_margin(SIDE_LEFT, Control::get_theme_icon(SNAME("arrow"))->get_width());
 					_set_internal_margin(SIDE_RIGHT, 0.f);
 				} else {
 					_set_internal_margin(SIDE_LEFT, 0.f);
-					_set_internal_margin(SIDE_RIGHT, Control::get_theme_icon("arrow")->get_width());
+					_set_internal_margin(SIDE_RIGHT, Control::get_theme_icon(SNAME("arrow"))->get_width());
 				}
 			}
 		} break;
@@ -107,7 +107,7 @@ void OptionButton::_notification(int p_what) {
 }
 
 void OptionButton::_focused(int p_which) {
-	emit_signal("item_focused", p_which);
+	emit_signal(SNAME("item_focused"), p_which);
 }
 
 void OptionButton::_selected(int p_which) {
@@ -115,7 +115,7 @@ void OptionButton::_selected(int p_which) {
 }
 
 void OptionButton::pressed() {
-	Size2 size = get_size();
+	Size2 size = get_size() * get_viewport()->get_canvas_transform().get_scale();
 	popup->set_position(get_screen_position() + Size2(0, size.height * get_global_transform().get_scale().y));
 	popup->set_size(Size2(size.width, 0));
 	popup->popup();
@@ -220,7 +220,7 @@ void OptionButton::_select(int p_which, bool p_emit) {
 	set_icon(popup->get_item_icon(current));
 
 	if (is_inside_tree() && p_emit) {
-		emit_signal("item_selected", current);
+		emit_signal(SNAME("item_selected"), current);
 	}
 }
 
@@ -336,23 +336,22 @@ void OptionButton::_bind_methods() {
 }
 
 OptionButton::OptionButton() {
-	current = -1;
 	set_toggle_mode(true);
 	set_text_align(ALIGN_LEFT);
 	if (is_layout_rtl()) {
-		if (has_theme_icon("arrow")) {
-			_set_internal_margin(SIDE_LEFT, Control::get_theme_icon("arrow")->get_width());
+		if (has_theme_icon(SNAME("arrow"))) {
+			_set_internal_margin(SIDE_LEFT, Control::get_theme_icon(SNAME("arrow"))->get_width());
 		}
 	} else {
-		if (has_theme_icon("arrow")) {
-			_set_internal_margin(SIDE_RIGHT, Control::get_theme_icon("arrow")->get_width());
+		if (has_theme_icon(SNAME("arrow"))) {
+			_set_internal_margin(SIDE_RIGHT, Control::get_theme_icon(SNAME("arrow"))->get_width());
 		}
 	}
 	set_action_mode(ACTION_MODE_BUTTON_PRESS);
 
 	popup = memnew(PopupMenu);
 	popup->hide();
-	add_child(popup);
+	add_child(popup, false, INTERNAL_MODE_FRONT);
 	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));