Popups are now windows also (broken!)

1 files changed, 6 insertions, 8 deletions

diff --git a/scene/gui/menu_button.cpp b/scene/gui/menu_button.cpp
index 7f2ea7d3ed..4cae7b8f40 100644
--- a/scene/gui/menu_button.cpp
+++ b/scene/gui/menu_button.cpp
@@ -52,14 +52,13 @@ void MenuButton::_unhandled_key_input(Ref<InputEvent> p_event) {
 
 void MenuButton::pressed() {
 
-	emit_signal("about_to_show");
+	emit_signal("about_to_popup");
 	Size2 size = get_size();
 
-	Point2 gp = get_global_position();
-	popup->set_global_position(gp + Size2(0, size.height * get_global_transform().get_scale().y));
+	Point2 gp = get_screen_position();
+	popup->set_position(gp + 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->set_parent_rect(Rect2(Point2(gp - popup->get_global_position()), get_size()));
+	popup->set_parent_rect(Rect2(Point2(gp - popup->get_position()), get_size()));
 	popup->popup();
 }
 
@@ -116,7 +115,7 @@ void MenuButton::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "items", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL), "_set_items", "_get_items");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "switch_on_hover"), "set_switch_on_hover", "is_switch_on_hover");
 
-	ADD_SIGNAL(MethodInfo("about_to_show"));
+	ADD_SIGNAL(MethodInfo("about_to_popup"));
 }
 
 void MenuButton::set_disable_shortcuts(bool p_disabled) {
@@ -137,8 +136,7 @@ MenuButton::MenuButton() {
 	popup = memnew(PopupMenu);
 	popup->hide();
 	add_child(popup);
-	popup->set_pass_on_modal_close_click(false);
-	popup->connect("about_to_show", callable_mp((BaseButton *)this, &BaseButton::set_pressed), varray(true)); // For when switching from another MenuButton.
+	popup->connect("about_to_popup", callable_mp((BaseButton *)this, &BaseButton::set_pressed), varray(true)); // For when switching from another MenuButton.
 	popup->connect("popup_hide", callable_mp((BaseButton *)this, &BaseButton::set_pressed), varray(false));
 }