diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2019-04-30 10:15:02 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-30 10:15:02 +0200 |
commit | d0e628fa55da50bd4841f1865b47bb6b283fb886 (patch) | |
tree | 4b9f6670bce19d3a7bb0998151b34c3131930217 /scene/gui/menu_button.cpp | |
parent | d647f7ce71dc54dcc77a9e3591ba904ffa9ab1e2 (diff) | |
parent | b8e09f98c421c68816be9d58d528746efce91cb6 (diff) | |
download | redot-engine-d0e628fa55da50bd4841f1865b47bb6b283fb886.tar.gz |
Merge pull request #28334 from YeldhamDev/popup_buttons_scale
Make buttons that trigger popups have the same scale
Diffstat (limited to 'scene/gui/menu_button.cpp')
-rw-r--r-- | scene/gui/menu_button.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/gui/menu_button.cpp b/scene/gui/menu_button.cpp index 5f21d73ab2..e12cd55e6f 100644 --- a/scene/gui/menu_button.cpp +++ b/scene/gui/menu_button.cpp @@ -55,8 +55,9 @@ void MenuButton::pressed() { Size2 size = get_size(); Point2 gp = get_global_position(); - popup->set_global_position(gp + Size2(0, size.height)); + popup->set_global_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->popup(); } @@ -135,7 +136,6 @@ MenuButton::MenuButton() { popup = memnew(PopupMenu); popup->hide(); add_child(popup); - popup->set_as_toplevel(true); popup->set_pass_on_modal_close_click(false); popup->connect("about_to_show", this, "set_pressed", varray(true)); // For when switching from another MenuButton. popup->connect("popup_hide", this, "set_pressed", varray(false)); |