mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-29 16:54:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix function normalization being forced on.

Browse Source
This commit is contained in:
Bartosz Taudul 2022-08-18 14:13:53 +02:00
parent 197007ab47
commit 2f219188e1
No known key found for this signature in database
GPG Key ID: B7FE2008B7575DF3
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server/TracySourceView.cpp
View File

@ -2475,6 +2475,7 @@ uint64_t SourceView::RenderSymbolAsmView( const AddrStatData& as, Worker& worker
if( ImGui::IsWindowHovered() && ImGui::IsMouseHoveringRect( wpos + ImVec2( xoff + JumpSeparation * ( mjl - v.second.level ) - JumpSeparation / 2, y0 + th2 ), wpos + ImVec2( xoff + JumpSeparation * ( mjl - v.second.level ) + JumpSeparation / 2, y1 + th2 ) ) ) if( ImGui::IsWindowHovered() && ImGui::IsMouseHoveringRect( wpos + ImVec2( xoff + JumpSeparation * ( mjl - v.second.level ) - JumpSeparation / 2, y0 + th2 ), wpos + ImVec2( xoff + JumpSeparation * ( mjl - v.second.level ) + JumpSeparation / 2, y1 + th2 ) ) )
{ {
thickness = 2; thickness = 2;
const auto shortenName = view.GetShortenName();
UnsetFont(); UnsetFont();
ImGui::BeginTooltip(); ImGui::BeginTooltip();
char tmp[32]; char tmp[32];
@ -2506,7 +2507,9 @@ uint64_t SourceView::RenderSymbolAsmView( const AddrStatData& as, Worker& worker
ImGui::SameLine(); ImGui::SameLine();
ImGui::PushFont( m_smallFont ); ImGui::PushFont( m_smallFont );
ImGui::AlignTextToFramePadding(); ImGui::AlignTextToFramePadding();
TextDisabledUnformatted( ShortenZoneName( ShortenName::OnlyNormalize, worker.GetString( symData->name ) ) ); const auto symName = worker.GetString( symData->name );
const auto normalized = shortenName != ShortenName::Never ? ShortenZoneName( ShortenName::OnlyNormalize, symName ) : symName;
TextDisabledUnformatted( normalized );
ImGui::PopFont(); ImGui::PopFont();
} }
} }
@ -2541,7 +2544,9 @@ uint64_t SourceView::RenderSymbolAsmView( const AddrStatData& as, Worker& worker
ImGui::SameLine(); ImGui::SameLine();
ImGui::PushFont( m_smallFont ); ImGui::PushFont( m_smallFont );
ImGui::AlignTextToFramePadding(); ImGui::AlignTextToFramePadding();
TextDisabledUnformatted( ShortenZoneName( ShortenName::OnlyNormalize, worker.GetString( symData->name ) ) ); const auto symName = worker.GetString( symData->name );
const auto normalized = shortenName != ShortenName::Never ? ShortenZoneName( ShortenName::OnlyNormalize, symName ) : symName;
TextDisabledUnformatted( normalized );
ImGui::PopFont(); ImGui::PopFont();
} }
} }
@ -2706,7 +2711,9 @@ uint64_t SourceView::RenderSymbolAsmView( const AddrStatData& as, Worker& worker
auto jumpSym = jumpBase == 0 ? worker.GetSymbolData( m_jumpPopupAddr ) : worker.GetSymbolData( jumpBase ); auto jumpSym = jumpBase == 0 ? worker.GetSymbolData( m_jumpPopupAddr ) : worker.GetSymbolData( jumpBase );
if( jumpSym ) if( jumpSym )
{ {
snprintf( buf, 1024, "%s+%" PRIu32, ShortenZoneName( ShortenName::OnlyNormalize, worker.GetString( jumpSym->name ) ), jumpOffset ); const auto jumpName = worker.GetString( jumpSym->name );
const auto normalized = view.GetShortenName() != ShortenName::Never ? ShortenZoneName( ShortenName::OnlyNormalize, jumpName ) : jumpName;
snprintf( buf, 1024, "%s+%" PRIu32, normalized, jumpOffset );
} }
else else
{ {