Andrew/redot-engine
1
0
Fork 0
mirror of https://github.com/Redot-Engine/redot-engine.git synced 2025-12-06 23:31:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixes control nodes size not updated when outside the tree

Browse Source
This commit is contained in:
groud
2018-07-04 14:29:29 +02:00
parent 3724f1562b
commit 560deda207
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scene/gui/control.cpp
View File

@@ -1295,9 +1295,6 @@ Size2 Control::get_parent_area_size() const {
void Control::_size_changed() { void Control::_size_changed() {
if (!is_inside_tree())
return;
Rect2 parent_rect = get_parent_anchorable_rect(); Rect2 parent_rect = get_parent_anchorable_rect();
float margin_pos[4]; float margin_pos[4];
@@ -1334,7 +1331,7 @@ void Control::_size_changed() {
} }
// We use a little workaround to avoid flickering when moving the pivot with _edit_set_pivot() // We use a little workaround to avoid flickering when moving the pivot with _edit_set_pivot()
if (Math::abs(Math::sin(data.rotation * 4.0f)) < 0.00001f && get_viewport()->is_snap_controls_to_pixels_enabled()) { if (is_inside_tree() && Math::abs(Math::sin(data.rotation * 4.0f)) < 0.00001f && get_viewport()->is_snap_controls_to_pixels_enabled()) {
new_size_cache = new_size_cache.round(); new_size_cache = new_size_cache.round();
new_pos_cache = new_pos_cache.round(); new_pos_cache = new_pos_cache.round();
} }
@@ -1344,6 +1341,7 @@ void Control::_size_changed() {
data.pos_cache = new_pos_cache; data.pos_cache = new_pos_cache;
data.size_cache = new_size_cache; data.size_cache = new_size_cache;
if (is_inside_tree()) {
if (size_changed) { if (size_changed) {
notification(NOTIFICATION_RESIZED); notification(NOTIFICATION_RESIZED);
} }
@@ -1357,6 +1355,7 @@ void Control::_size_changed() {
_update_canvas_item_transform(); //move because it won't be updated _update_canvas_item_transform(); //move because it won't be updated
} }
} }
}
void Control::set_anchor(Margin p_margin, float p_anchor, bool p_keep_margin, bool p_push_opposite_anchor) { void Control::set_anchor(Margin p_margin, float p_anchor, bool p_keep_margin, bool p_push_opposite_anchor) {
Rect2 parent_rect = get_parent_anchorable_rect(); Rect2 parent_rect = get_parent_anchorable_rect();