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

Disable error condition for accessing safe rect 

This PR removes the error-message, which is currently expected to happen.
The task of correctly fixing the underlying problem of window popup
closing is more complex, so this PR solves the immediate
error-notification-problem.
This commit is contained in:
Markus Sauermann 2023-07-26 20:15:18 +02:00
parent 8367152723
commit 7fead979d6
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 { Rect2i Viewport::subwindow_get_popup_safe_rect(Window *p_window) const {
int index = _sub_window_find(p_window); 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; return gui.sub_windows[index].parent_safe_rect;
} }