diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-05-30 19:53:19 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-05-30 19:53:19 -0300 |
| commit | 4d6d6fcbfc9cd7e37ad38bb83c05f9260e50d5bc (patch) | |
| tree | cdfe7df066d47960f53af46f90c4cc865db82f3e /tools/editor/progress_dialog.cpp | |
| parent | 0eb6c644b282440d3e83aaa4db6db2c48be46f8c (diff) | |
| parent | 97b116dfc6db2d8706e2f64d1f51aec729497398 (diff) | |
Merge remote-tracking branch 'origin/master'
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 2814101a27..a950f7acfc 100644 --- a/tools/editor/progress_dialog.cpp +++ b/tools/editor/progress_dialog.cpp @@ -30,7 +30,7 @@ #include "main/main.h" #include "message_queue.h" #include "os/os.h" - +#include "editor_scale.h" void BackgroundProgress::_add_task(const String& p_task,const String& p_label, int p_steps) { _THREAD_SAFE_METHOD_ @@ -48,7 +48,7 @@ void BackgroundProgress::_add_task(const String& p_task,const String& p_label, i ec->set_v_size_flags(SIZE_EXPAND_FILL); t.progress->set_area_as_parent_rect(); ec->add_child(t.progress); - ec->set_custom_minimum_size(Size2(80,5)); + ec->set_custom_minimum_size(Size2(80,5)*EDSCALE); t.hb->add_child(ec); add_child(t.hb); @@ -160,7 +160,7 @@ void ProgressDialog::_notification(int p_what) { void ProgressDialog::_popup() { Size2 ms = main->get_combined_minimum_size(); - ms.width = MAX(500,ms.width); + ms.width = MAX(500*EDSCALE,ms.width); Ref<StyleBox> style = get_stylebox("panel","PopupMenu"); |