diff options
author | Juan Linietsky <reduzio@gmail.com> | 2016-08-25 17:45:20 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2016-08-25 17:45:20 -0300 |
commit | 9c6175db11ff72603ae58789a462b33ec1e910f8 (patch) | |
tree | c7fbb26583b6c7f44b9f8091aa59497900527f08 /scene/gui/control.cpp | |
parent | 41a58f7935ecd0c91ae55a5e5b84425aadc51840 (diff) | |
download | redot-engine-9c6175db11ff72603ae58789a462b33ec1e910f8.tar.gz |
More visual script work
-Block switches to 2d/3d editor if editing visual script
-Added cast node in flow control
-Added ability to do RPC in visual script
-Comment nodes
-Fix bug with inverted cable in connecting backwards
-Copy and paste nodes, including from different scripts
Diffstat (limited to 'scene/gui/control.cpp')
-rw-r--r-- | scene/gui/control.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp index 71ec508c81..97133a2a3b 100644 --- a/scene/gui/control.cpp +++ b/scene/gui/control.cpp @@ -2214,7 +2214,7 @@ void Control::grab_click_focus() { void Control::minimum_size_changed() { - if (!is_inside_tree()) + if (!is_inside_tree() || data.block_minimum_size_adjust) return; if (data.pending_min_size_update) @@ -2374,8 +2374,14 @@ Control *Control::get_root_parent_control() const { return const_cast<Control*>(root); } +void Control::set_block_minimum_size_adjust(bool p_block) { + data.block_minimum_size_adjust=p_block; +} +bool Control::is_minimum_size_adjust_blocked() const { + return data.block_minimum_size_adjust; +} void Control::_bind_methods() { @@ -2603,6 +2609,7 @@ Control::Control() { data.scale=Vector2(1,1); data.drag_owner=0; data.modal_frame=0; + data.block_minimum_size_adjust=false; for (int i=0;i<4;i++) { |