From b80899863b103b3b1787a64f1523b8a2ecb6d1e7 Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Fri, 26 Mar 2021 00:40:54 +0100 Subject: [PATCH] Consistently use "entry call stacks". --- NEWS | 1 + server/TracyView.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index f20fb08c..2087a8c1 100644 --- a/NEWS +++ b/NEWS @@ -32,6 +32,7 @@ v0.x.x (xxxx-xx-xx) - Fixed color channel order in ZoneColor() macro. - Handle failure state when a memory pointer allocation is reported twice, without an intermediate free. +- Renamed "call stack parents" to "entry call stacks". - Display number of entry call stacks in assembly line sample count tooltip. diff --git a/server/TracyView.cpp b/server/TracyView.cpp index 8d3b03c7..9df54c90 100644 --- a/server/TracyView.cpp +++ b/server/TracyView.cpp @@ -15294,7 +15294,7 @@ void View::DrawSampleParents() bool show = true; ImGui::SetNextWindowSize( ImVec2( 1400, 500 ), ImGuiCond_FirstUseEver ); - ImGui::Begin( "Call stack sample parents", &show, ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoScrollWithMouse ); + ImGui::Begin( "Sample entry call stacks", &show, ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoScrollWithMouse ); ImGui::PushFont( m_bigFont ); TextFocused( "Symbol:", m_worker.GetString( symbol->name ) ); if( symbol->isInline ) @@ -15338,7 +15338,7 @@ void View::DrawSampleParents() ImGui::SameLine(); TextDisabledUnformatted( m_worker.GetString( symbol->imageName ) ); ImGui::Separator(); - TextDisabledUnformatted( "Parent call stack:" ); + TextDisabledUnformatted( "Entry call stack:" ); ImGui::SameLine(); if( ImGui::SmallButton( " " ICON_FA_CARET_LEFT " " ) ) {