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

Merge pull request #46516 from HaSa1002/scrollcontainer-embed 

Fix Window returning `INVALID_WINDOW_ID` when being embedded
This commit is contained in:
Rémi Verschelde 2021-03-05 13:46:44 +01:00 committed by GitHub
parent bd9799e9f0 a97db7fad6
commit bc6713ef50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scene/main/window.cpp
View File

@ -826,6 +826,9 @@ bool Window::is_using_font_oversampling() const {
}
DisplayServer::WindowID Window::get_window_id() const {
if (embedder) {
return parent->get_window_id();
}
return window_id;
}