diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-03-05 13:46:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-05 13:46:44 +0100 |
| commit | bc6713ef503c69afc9828c9505080e19ed26ab7c (patch) | |
| tree | 1b9526fa88a634930201ba9a80f38eabeee407e5 /scene/main | |
| parent | bd9799e9f0a9a9c7d0dd22d5f3f520f450520caf (diff) | |
| parent | a97db7fad63c9c8db338209719cb686a1b273309 (diff) | |
Merge pull request #46516 from HaSa1002/scrollcontainer-embed
Fix Window returning `INVALID_WINDOW_ID` when being embedded
Diffstat (limited to 'scene/main')
| -rw-r--r-- | scene/main/window.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/scene/main/window.cpp b/scene/main/window.cpp index e40e990cf7..d697a1a5dd 100644 --- a/scene/main/window.cpp +++ b/scene/main/window.cpp @@ -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; } |