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

Merge pull request #80117 from Sauermann/fix-actually-store-safe-rect 

Actually store safe-rect in embedder
This commit is contained in:
Yuri Sizov 2023-08-02 21:48:02 +02:00 committed by GitHub
parent 79f6ac5cd5 1e9d241809
commit 237bd0a615
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scene/main/viewport.cpp
View File

@ -3637,8 +3637,7 @@ void Viewport::subwindow_set_popup_safe_rect(Window *p_window, const Rect2i &p_r
int index = _sub_window_find(p_window); int index = _sub_window_find(p_window);
ERR_FAIL_COND(index == -1); ERR_FAIL_COND(index == -1);
SubWindow sw = gui.sub_windows[index]; gui.sub_windows.write[index].parent_safe_rect = p_rect;
sw.parent_safe_rect = p_rect;
} }
Rect2i Viewport::subwindow_get_popup_safe_rect(Window *p_window) const { Rect2i Viewport::subwindow_get_popup_safe_rect(Window *p_window) const {

15
tests/scene/test_viewport.h
View File

@ -756,6 +756,21 @@ TEST_CASE("[SceneTree][Viewport] Control mouse cursor shape") {
} }
} }
TEST_CASE("[SceneTree][Viewport] Embedded Windows") {
Window *root = SceneTree::get_singleton()->get_root();
Window *w = memnew(Window);
SUBCASE("[Viewport] Safe-rect of embedded Window") {
root->add_child(w);
root->subwindow_set_popup_safe_rect(w, Rect2i(10, 10, 10, 10));
CHECK_EQ(root->subwindow_get_popup_safe_rect(w), Rect2i(10, 10, 10, 10));
root->remove_child(w);
CHECK_EQ(root->subwindow_get_popup_safe_rect(w), Rect2i());
}
memdelete(w);
}
} // namespace TestViewport } // namespace TestViewport
#endif // TEST_VIEWPORT_H #endif // TEST_VIEWPORT_H