diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2022-09-16 09:22:57 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2022-09-16 09:22:57 +0200 |
| commit | d347d2f5853303c91eee51079e2042657d156e83 (patch) | |
| tree | 00c4d31a9126682610f8a78e4c55785b9f11492d | |
| parent | 14c602f032a7932e801292d8277b98baaa232bfb (diff) | |
| parent | 00e153f85a9975392484ada01d4dbce05397c1d7 (diff) | |
Merge pull request #65550 from MinusKube/small-popup-bug
Use embedding viewport instead of parent viewport to determine popup rect
| -rw-r--r-- | scene/main/window.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scene/main/window.cpp b/scene/main/window.cpp index 04f56bb874..f481cd8346 100644 --- a/scene/main/window.cpp +++ b/scene/main/window.cpp @@ -1153,7 +1153,7 @@ void Window::popup_centered_clamped(const Size2i &p_size, float p_fallback_ratio Rect2 parent_rect; if (is_embedded()) { - parent_rect = get_parent_viewport()->get_visible_rect(); + parent_rect = _get_embedder()->get_visible_rect(); } else { DisplayServer::WindowID parent_id = get_parent_visible_window()->get_window_id(); int parent_screen = DisplayServer::get_singleton()->window_get_current_screen(parent_id); @@ -1179,7 +1179,7 @@ void Window::popup_centered(const Size2i &p_minsize) { Rect2 parent_rect; if (is_embedded()) { - parent_rect = get_parent_viewport()->get_visible_rect(); + parent_rect = _get_embedder()->get_visible_rect(); } else { DisplayServer::WindowID parent_id = get_parent_visible_window()->get_window_id(); int parent_screen = DisplayServer::get_singleton()->window_get_current_screen(parent_id); @@ -1207,7 +1207,7 @@ void Window::popup_centered_ratio(float p_ratio) { Rect2 parent_rect; if (is_embedded()) { - parent_rect = get_parent_viewport()->get_visible_rect(); + parent_rect = _get_embedder()->get_visible_rect(); } else { DisplayServer::WindowID parent_id = get_parent_visible_window()->get_window_id(); int parent_screen = DisplayServer::get_singleton()->window_get_current_screen(parent_id); |