summaryrefslogtreecommitdiff
path: root/editor
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2021-07-24 10:20:08 +0200
committerGitHub <noreply@github.com>2021-07-24 10:20:08 +0200
commit9ac27b58c53b50b5c7085a8fdee653e9eff159d1 (patch)
tree6b0dc035b1e2fa94fb650e7553269c437ce6bd2c /editor
parentb918c4c3ce84af1f8af2d06ef31784f48a15551a (diff)
parente837e04ef8dc827a7a60e65f5adb1f5ae6bccf88 (diff)
Merge pull request #50795 from Calinou/editor-profiler-display-time-add-tooltips
Add a tooltip for Inclusive and Self in the editor profiler
Diffstat (limited to 'editor')
-rw-r--r--editor/debugger/editor_profiler.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/editor/debugger/editor_profiler.cpp b/editor/debugger/editor_profiler.cpp
index 6b015e1fda..fa9c9f61f5 100644
--- a/editor/debugger/editor_profiler.cpp
+++ b/editor/debugger/editor_profiler.cpp
@@ -588,8 +588,8 @@ EditorProfiler::EditorProfiler() {
hb->add_child(memnew(Label(TTR("Measure:"))));
display_mode = memnew(OptionButton);
- display_mode->add_item(TTR("Frame Time (sec)"));
- display_mode->add_item(TTR("Average Time (sec)"));
+ display_mode->add_item(TTR("Frame Time (ms)"));
+ display_mode->add_item(TTR("Average Time (ms)"));
display_mode->add_item(TTR("Frame %"));
display_mode->add_item(TTR("Physics Frame %"));
display_mode->connect("item_selected", callable_mp(this, &EditorProfiler::_combo_changed));
@@ -601,6 +601,7 @@ EditorProfiler::EditorProfiler() {
display_time = memnew(OptionButton);
display_time->add_item(TTR("Inclusive"));
display_time->add_item(TTR("Self"));
+ display_time->set_tooltip(TTR("Inclusive: Includes time from other functions called by this function.\nUse this to spot bottlenecks.\n\nSelf: Only count the time spent in the function itself, not in other functions called by that function.\nUse this to find individual functions to optimize."));
display_time->connect("item_selected", callable_mp(this, &EditorProfiler::_combo_changed));
hb->add_child(display_time);