diff options
| author | halgriffiths <henrygriffiths@improbable.io> | 2022-09-06 16:15:00 +0100 |
|---|---|---|
| committer | halgriffiths <henrygriffiths@improbable.io> | 2022-09-13 10:21:11 +0100 |
| commit | 026e0811b95dc94df7eb7dbbdfde36d7d2d8fb0d (patch) | |
| tree | 531994d4cabc06d647ac0c5abc0e674773da0f61 /editor/debugger/editor_profiler.cpp | |
| parent | 0f62e357e0868ce7e7f822379027d86dd927dbca (diff) | |
| download | redot-engine-026e0811b95dc94df7eb7dbbdfde36d7d2d8fb0d.tar.gz | |
Fix profiler being disabled at wrong times
Co-authored by: Will Whitty <tavurth@gmail.com>
Diffstat (limited to 'editor/debugger/editor_profiler.cpp')
| -rw-r--r-- | editor/debugger/editor_profiler.cpp | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/editor/debugger/editor_profiler.cpp b/editor/debugger/editor_profiler.cpp index cf48366bd3..a882275375 100644 --- a/editor/debugger/editor_profiler.cpp +++ b/editor/debugger/editor_profiler.cpp @@ -104,6 +104,10 @@ void EditorProfiler::clear() { updating_frame = false; hover_metric = -1; seeking = false; + + // Ensure button text (start, stop) is correct + _set_button_text(); + emit_signal(SNAME("enable_profiling"), activate->is_pressed()); } static String _get_percent_txt(float p_value, float p_total) { @@ -374,15 +378,23 @@ void EditorProfiler::_update_frame() { updating_frame = false; } -void EditorProfiler::_activate_pressed() { +void EditorProfiler::_set_button_text() { if (activate->is_pressed()) { activate->set_icon(get_theme_icon(SNAME("Stop"), SNAME("EditorIcons"))); activate->set_text(TTR("Stop")); - _clear_pressed(); } else { activate->set_icon(get_theme_icon(SNAME("Play"), SNAME("EditorIcons"))); activate->set_text(TTR("Start")); } +} + +void EditorProfiler::_activate_pressed() { + _set_button_text(); + + if (activate->is_pressed()) { + _clear_pressed(); + } + emit_signal(SNAME("enable_profiling"), activate->is_pressed()); } @@ -499,8 +511,12 @@ void EditorProfiler::_bind_methods() { ADD_SIGNAL(MethodInfo("break_request")); } -void EditorProfiler::set_enabled(bool p_enable) { +void EditorProfiler::set_enabled(bool p_enable, bool p_clear) { + activate->set_pressed(false); activate->set_disabled(!p_enable); + if (p_clear) { + clear(); + } } bool EditorProfiler::is_profiling() { |