From 42cbdbc7df9e71c0ad806c8e6321794a23d912ad Mon Sep 17 00:00:00 2001 From: Yuri Sizov Date: Tue, 10 Jan 2023 23:07:57 +0300 Subject: Ensure that the cached layout mode is in sync --- scene/gui/control.cpp | 10 ++++++++++ scene/gui/control.h | 1 + 2 files changed, 11 insertions(+) (limited to 'scene') diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp index 8460728448..a2fdcd688c 100644 --- a/scene/gui/control.cpp +++ b/scene/gui/control.cpp @@ -864,6 +864,14 @@ void Control::_set_layout_mode(LayoutMode p_mode) { } } +void Control::_update_layout_mode() { + LayoutMode computed_layout = _get_layout_mode(); + if (data.stored_layout_mode != computed_layout) { + data.stored_layout_mode = computed_layout; + notify_property_list_changed(); + } +} + Control::LayoutMode Control::_get_layout_mode() const { Node *parent_node = get_parent_control(); // In these modes the property is read-only. @@ -2870,6 +2878,8 @@ void Control::_notification(int p_notification) { data.parent_window = Object::cast_to(parent_node); data.theme_owner->assign_theme_on_parented(this); + + _update_layout_mode(); } break; case NOTIFICATION_UNPARENTED: { diff --git a/scene/gui/control.h b/scene/gui/control.h index 9705dd62db..9147268c86 100644 --- a/scene/gui/control.h +++ b/scene/gui/control.h @@ -280,6 +280,7 @@ private: void _compute_anchors(Rect2 p_rect, const real_t p_offsets[4], real_t (&r_anchors)[4]); void _set_layout_mode(LayoutMode p_mode); + void _update_layout_mode(); LayoutMode _get_layout_mode() const; LayoutMode _get_default_layout_mode() const; void _set_anchors_layout_preset(int p_preset); -- cgit v1.2.3