From 8f36ee2c895299d519d1529fc166afec25385ba9 Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Wed, 26 Feb 2020 01:04:51 +0100 Subject: [PATCH] Display module name in callstack window. --- server/TracyView.cpp | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/server/TracyView.cpp b/server/TracyView.cpp index 47ac5033..26e84ffa 100644 --- a/server/TracyView.cpp +++ b/server/TracyView.cpp @@ -11117,7 +11117,7 @@ void View::DrawStatistics() void View::DrawCallstackWindow() { bool show = true; - ImGui::SetNextWindowSize( ImVec2( 1200, 500 ), ImGuiCond_FirstUseEver ); + ImGui::SetNextWindowSize( ImVec2( 1400, 500 ), ImGuiCond_FirstUseEver ); ImGui::Begin( "Call stack", &show, ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoScrollWithMouse ); #ifdef TRACY_EXTENDED_FONT @@ -11132,13 +11132,14 @@ void View::DrawCallstackWindow() ImGui::BeginChild( "##callstack" ); const auto w = ImGui::GetWindowWidth(); static bool widthSet = false; - ImGui::Columns( 3 ); + ImGui::Columns( 4 ); if( !widthSet ) { widthSet = true; ImGui::SetColumnWidth( 0, w * 0.05f ); - ImGui::SetColumnWidth( 1, w * 0.475f ); - ImGui::SetColumnWidth( 2, w * 0.475f ); + ImGui::SetColumnWidth( 1, w * 0.425f ); + ImGui::SetColumnWidth( 2, w * 0.425f ); + ImGui::SetColumnWidth( 3, w * 0.1f ); } ImGui::TextUnformatted( "Frame" ); ImGui::NextColumn(); @@ -11150,6 +11151,8 @@ void View::DrawCallstackWindow() ImGui::SameLine(); DrawHelpMarker( "Click on entry to copy it to clipboard.\nRight click on entry to try to open source file." ); ImGui::NextColumn(); + ImGui::TextUnformatted( "Image" ); + ImGui::NextColumn(); int fidx = 0; int bidx = 0; @@ -11170,6 +11173,7 @@ void View::DrawCallstackWindow() } ImGui::NextColumn(); ImGui::NextColumn(); + ImGui::NextColumn(); } else { @@ -11284,6 +11288,11 @@ void View::DrawCallstackWindow() } ImGui::PopTextWrapPos(); ImGui::NextColumn(); + if( frameData->imageName.Active() ) + { + TextDisabledUnformatted( m_worker.GetString( frameData->imageName ) ); + } + ImGui::NextColumn(); } } }