mirrors/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy synced 2025-04-30 04:43:53 +00:00
Code Issues Releases Wiki Activity

Normalize names in function selection list in symbol view.

Browse Source
This commit is contained in:
Bartosz Taudul 2022-08-15 22:06:35 +02:00
parent b1aca6acf9
commit 163e7fd490
No known key found for this signature in database
GPG Key ID: B7FE2008B7575DF3
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
server/TracySourceView.cpp
View File

@ -1090,6 +1090,7 @@ void SourceView::RenderSymbolView( Worker& worker, View& view )
{ {
assert( m_symAddr != 0 ); assert( m_symAddr != 0 );
const auto shortenName = view.GetShortenName();
auto sym = worker.GetSymbolData( m_symAddr ); auto sym = worker.GetSymbolData( m_symAddr );
assert( sym ); assert( sym );
if( sym->isInline ) if( sym->isInline )
@ -1098,7 +1099,7 @@ void SourceView::RenderSymbolView( Worker& worker, View& view )
if( parent ) if( parent )
{ {
const auto symName = worker.GetString( parent->name ); const auto symName = worker.GetString( parent->name );
if( view.GetShortenName() == ShortenName::Never ) if( shortenName == ShortenName::Never )
{ {
TextFocused( ICON_FA_PUZZLE_PIECE " Symbol:", symName ); TextFocused( ICON_FA_PUZZLE_PIECE " Symbol:", symName );
} }
@ -1119,7 +1120,7 @@ void SourceView::RenderSymbolView( Worker& worker, View& view )
else else
{ {
const auto symName = worker.GetString( sym->name ); const auto symName = worker.GetString( sym->name );
if( view.GetShortenName() == ShortenName::Never ) if( shortenName == ShortenName::Never )
{ {
TextFocused( ICON_FA_PUZZLE_PIECE " Symbol:", symName ); TextFocused( ICON_FA_PUZZLE_PIECE " Symbol:", symName );
} }
@ -1153,7 +1154,8 @@ void SourceView::RenderSymbolView( Worker& worker, View& view )
ImGui::SameLine(); ImGui::SameLine();
ImGui::SetNextItemWidth( -1 ); ImGui::SetNextItemWidth( -1 );
ImGui::PushStyleVar( ImGuiStyleVar_FramePadding, ImVec2( 0, 0 ) ); ImGui::PushStyleVar( ImGuiStyleVar_FramePadding, ImVec2( 0, 0 ) );
const auto currSymName = m_symAddr == m_baseAddr ? "[ - self - ]" : worker.GetString( sym->name ); auto currSymName = m_symAddr == m_baseAddr ? "[ - self - ]" : worker.GetString( sym->name );
if( shortenName != ShortenName::Never ) currSymName = ShortenZoneName( ShortenName::OnlyNormalize, currSymName );
if( ImGui::BeginCombo( "##functionList", currSymName, ImGuiComboFlags_HeightLarge ) ) if( ImGui::BeginCombo( "##functionList", currSymName, ImGuiComboFlags_HeightLarge ) )
{ {
const auto symEnd = m_baseAddr + m_codeLen; const auto symEnd = m_baseAddr + m_codeLen;
@ -1267,7 +1269,12 @@ void SourceView::RenderSymbolView( Worker& worker, View& view )
} }
ImGui::PushID( v.first ); ImGui::PushID( v.first );
const auto symName = v.first == m_baseAddr ? "[ - self - ]" : worker.GetString( isym->name ); const auto symName = v.first == m_baseAddr ? "[ - self - ]" : worker.GetString( isym->name );
if( ImGui::Selectable( symName, v.first == m_symAddr, ImGuiSelectableFlags_SpanAllColumns ) ) const auto normalized = shortenName != ShortenName::Never ? ShortenZoneName( ShortenName::OnlyNormalize, symName ) : symName;
const auto selected = ImGui::Selectable( "", v.first == m_symAddr, ImGuiSelectableFlags_SpanAllColumns );
ImGui::SameLine( 0, 0 );
ImGui::TextUnformatted( normalized );
TooltipNormalizedName( symName, normalized );
if( selected )
{ {
m_symAddr = v.first; m_symAddr = v.first;
ParseSource( file, worker, view ); ParseSource( file, worker, view );