godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #42969 from Klowner/fixes/42967-popup-position 

include parent display location in popup location calculation
This commit is contained in:
Rémi Verschelde 2020-10-26 09:26:00 +01:00 committed by GitHub
parent d667ea116d 5a507df255
commit 2de498d438
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scene/main/window.cpp
View File

@ -983,7 +983,7 @@ void Window::popup_centered_clamped(const Size2i &p_size, float p_fallback_ratio
Rect2i popup_rect; Rect2i popup_rect;
popup_rect.size = Vector2i(MIN(size_ratio.x, p_size.x), MIN(size_ratio.y, p_size.y)); 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); popup(popup_rect);
} }
@ -1009,7 +1009,7 @@ void Window::popup_centered(const Size2i &p_minsize) {
} else { } else {
popup_rect.size = p_minsize; 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); popup(popup_rect);
} }
@ -1031,7 +1031,7 @@ void Window::popup_centered_ratio(float p_ratio) {
Rect2i popup_rect; Rect2i popup_rect;
popup_rect.size = parent_rect.size * p_ratio; 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); popup(popup_rect);
} }