diff options
| author | Ariel Manzur <ariel@godotengine.org> | 2015-12-21 09:17:15 -0300 |
|---|---|---|
| committer | Ariel Manzur <ariel@godotengine.org> | 2015-12-21 09:17:15 -0300 |
| commit | 0576e1e28f41f103cd06452d810a04265e3574cc (patch) | |
| tree | 817c1a5e3ca8b8f786e013c0322e4052e7f85d59 /tools/editor/progress_dialog.h | |
| parent | 72a6b137ba256f5198843f8980107c350d52e5ca (diff) | |
| parent | 15429d6ac95acb044c9eebd64356f33e7e5d14ef (diff) | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'tools/editor/progress_dialog.h')
| -rw-r--r-- | tools/editor/progress_dialog.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/editor/progress_dialog.h b/tools/editor/progress_dialog.h index 7f1cc4cb2d..8c75948fda 100644 --- a/tools/editor/progress_dialog.h +++ b/tools/editor/progress_dialog.h @@ -84,6 +84,7 @@ class ProgressDialog : public Popup { Map<String,Task> tasks; VBoxContainer *main; + uint64_t last_progress_tick; void _popup(); protected: @@ -92,7 +93,7 @@ protected: public: void add_task(const String& p_task,const String& p_label, int p_steps); - void task_step(const String& p_task,const String& p_state, int p_step=-1); + void task_step(const String& p_task, const String& p_state, int p_step=-1, bool p_force_redraw=true); void end_task(const String& p_task); |