mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-27 09:16:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #79937 from Sauermann/fix-expected-safe-rect-error

Browse Source 
Disable error condition for accessing safe rect
This commit is contained in:
Yuri Sizov 2023-07-27 15:22:54 +02:00
commit 08e1a69897
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scene/main/viewport.cpp
View File

@ -3510,7 +3510,12 @@ void Viewport::subwindow_set_popup_safe_rect(Window *p_window, const Rect2i &p_r
Rect2i Viewport::subwindow_get_popup_safe_rect(Window *p_window) const {
int index = _sub_window_find(p_window);
ERR_FAIL_COND_V(index == -1, Rect2i());
// FIXME: Re-enable ERR_FAIL_COND after rewriting embedded window popup closing.
// Currently it is expected, that index == -1 can happen.
if (index == -1) {
return Rect2i();
}
// ERR_FAIL_COND_V(index == -1, Rect2i());
return gui.sub_windows[index].parent_safe_rect;
}