diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-10-26 09:26:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-26 09:26:00 +0100 |
| commit | 2de498d438723eddde7630187e327f919f4e49f5 (patch) | |
| tree | bee3850488835f49ee36dc6de0bff7e4c5496de7 | |
| parent | d667ea116d419eacfedf81164e4bb140a91e5012 (diff) | |
| parent | 5a507df255c0b4f04df1c2a7ede13d6d7a49d17c (diff) | |
Merge pull request #42969 from Klowner/fixes/42967-popup-position
include parent display location in popup location calculation
| -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 9f014e8175..4116d5ce10 100644 --- a/scene/main/window.cpp +++ b/scene/main/window.cpp @@ -983,7 +983,7 @@ void Window::popup_centered_clamped(const Size2i &p_size, float p_fallback_ratio Rect2i popup_rect; popup_rect.size = Vector2i(MIN(size_ratio.x, p_size.x), MIN(size_ratio.y, p_size.y)); - popup_rect.position = (parent_rect.size - popup_rect.size) / 2; + popup_rect.position = parent_rect.position + (parent_rect.size - popup_rect.size) / 2; popup(popup_rect); } @@ -1009,7 +1009,7 @@ void Window::popup_centered(const Size2i &p_minsize) { } else { popup_rect.size = p_minsize; } - popup_rect.position = (parent_rect.size - popup_rect.size) / 2; + popup_rect.position = parent_rect.position + (parent_rect.size - popup_rect.size) / 2; popup(popup_rect); } @@ -1031,7 +1031,7 @@ void Window::popup_centered_ratio(float p_ratio) { Rect2i popup_rect; popup_rect.size = parent_rect.size * p_ratio; - popup_rect.position = (parent_rect.size - popup_rect.size) / 2; + popup_rect.position = parent_rect.position + (parent_rect.size - popup_rect.size) / 2; popup(popup_rect); } |