summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2022-09-03 18:23:45 +0200
committerGitHub <noreply@github.com>2022-09-03 18:23:45 +0200
commita653801b17adb41df6ada00a6ef50bff9fb5b6e8 (patch)
treecf361b3737a23179882cdce534978ad3ecd0d9a2
parent5d628e41080eefc9720dd0af7ea90f43f880387a (diff)
parent41eabca0fb63b8bc31ee448cb77b73aa0762dd8c (diff)
Merge pull request #65285 from YuriSizov/window-theme-change-is-imminent
Un-defer the initial theme changed notification in `Window`
-rw-r--r--scene/main/window.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/scene/main/window.cpp b/scene/main/window.cpp
index 84e4162c00..04f56bb874 100644
--- a/scene/main/window.cpp
+++ b/scene/main/window.cpp
@@ -865,9 +865,7 @@ void Window::_notification(int p_what) {
RS::get_singleton()->viewport_set_active(get_viewport_rid(), true);
}
- // Need to defer here, because theme owner information might be set in
- // add_child_notify, which doesn't get called until right after this.
- call_deferred(SNAME("notification"), NOTIFICATION_THEME_CHANGED);
+ notification(NOTIFICATION_THEME_CHANGED);
} break;
case NOTIFICATION_THEME_CHANGED: {