diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-06-27 12:03:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-27 12:03:36 +0200 |
| commit | 82a56e5c42417211e60a5da56864e1f3e4219128 (patch) | |
| tree | f4cbf5cb8ba57827c0cfe1cef143b6ee13ad4f2d /scene/main | |
| parent | 11f5d2141a9ffd3a0a98c59d2d24682d9e3f4c8f (diff) | |
| parent | ba273c6c5f1f3ae5601afcb7071d73a2f9d1628f (diff) | |
Merge pull request #61587 from YuriSizov/control-fix-theme-owner-toplevel
Fix theme propagation for children of top level controls and windows
Diffstat (limited to 'scene/main')
| -rw-r--r-- | scene/main/window.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/scene/main/window.cpp b/scene/main/window.cpp index 69fb5fdf07..73e8f537d9 100644 --- a/scene/main/window.cpp +++ b/scene/main/window.cpp @@ -822,6 +822,22 @@ void Window::_notification(int p_what) { emit_signal(SceneStringNames::get_singleton()->visibility_changed); RS::get_singleton()->viewport_set_active(get_viewport_rid(), true); } + + if (theme.is_null()) { + Control *parent_c = cast_to<Control>(get_parent()); + if (parent_c && (parent_c->data.theme_owner || parent_c->data.theme_owner_window)) { + theme_owner = parent_c->data.theme_owner; + theme_owner_window = parent_c->data.theme_owner_window; + notification(NOTIFICATION_THEME_CHANGED); + } else { + Window *parent_w = cast_to<Window>(get_parent()); + if (parent_w && (parent_w->theme_owner || parent_w->theme_owner_window)) { + theme_owner = parent_w->theme_owner; + theme_owner_window = parent_w->theme_owner_window; + notification(NOTIFICATION_THEME_CHANGED); + } + } + } } break; case NOTIFICATION_READY: { |