diff options
author | Juan Linietsky <reduzio@gmail.com> | 2015-01-03 17:24:16 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2015-01-03 17:24:16 -0300 |
commit | dc7ac86b798f40e1472871391af49a562879eadc (patch) | |
tree | 0cae39a004458c5a62cc14888a35f53e88aa42a1 /tools/editor/progress_dialog.cpp | |
parent | 0e1d70f637c31aa107f109a2e21ec9cd5e82d047 (diff) | |
download | redot-engine-dc7ac86b798f40e1472871391af49a562879eadc.tar.gz |
-Completely removed EmptyControl (but added fallback), closes #1017
Diffstat (limited to 'tools/editor/progress_dialog.cpp')
-rw-r--r-- | tools/editor/progress_dialog.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/editor/progress_dialog.cpp b/tools/editor/progress_dialog.cpp index ac54796c64..df40c5d5a5 100644 --- a/tools/editor/progress_dialog.cpp +++ b/tools/editor/progress_dialog.cpp @@ -29,7 +29,7 @@ #include "progress_dialog.h" #include "main/main.h" #include "message_queue.h" -#include "scene/gui/empty_control.h" + void BackgroundProgress::_add_task(const String& p_task,const String& p_label, int p_steps) { @@ -43,12 +43,12 @@ void BackgroundProgress::_add_task(const String& p_task,const String& p_label, i t.progress = memnew( ProgressBar ); t.progress->set_max(p_steps); t.progress->set_val(p_steps); - EmptyControl *ec = memnew( EmptyControl ); + Control *ec = memnew( Control ); ec->set_h_size_flags(SIZE_EXPAND_FILL); ec->set_v_size_flags(SIZE_EXPAND_FILL); t.progress->set_area_as_parent_rect(); ec->add_child(t.progress); - ec->set_minsize(Size2(80,5)); + ec->set_custom_minimum_size(Size2(80,5)); t.hb->add_child(ec); add_child(t.hb); |