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

Highlight source line corresponding to hovered asm line.

Browse Source
This commit is contained in:
Bartosz Taudul 2020-04-09 22:02:06 +02:00
parent 0791871955
commit 0e1c9e2cd1
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
server/TracySourceView.cpp
View File

@ -30,6 +30,8 @@ SourceView::SourceView( ImFont* font )
, m_dataSize( 0 ) , m_dataSize( 0 )
, m_targetLine( 0 ) , m_targetLine( 0 )
, m_selectedLine( 0 ) , m_selectedLine( 0 )
, m_hoveredLine( 0 )
, m_hoveredSource( 0 )
, m_codeLen( 0 ) , m_codeLen( 0 )
, m_highlightAddr( 0 ) , m_highlightAddr( 0 )
, m_asmRelative( false ) , m_asmRelative( false )
@ -323,6 +325,8 @@ bool SourceView::Disassemble( uint64_t symAddr, const Worker& worker )
void SourceView::Render( const Worker& worker ) void SourceView::Render( const Worker& worker )
{ {
m_highlightAddr.Decay( 0 ); m_highlightAddr.Decay( 0 );
m_hoveredLine.Decay( 0 );
m_hoveredSource.Decay( 0 );
if( m_symAddr == 0 ) if( m_symAddr == 0 )
{ {
@ -845,7 +849,11 @@ void SourceView::RenderLine( const Line& line, int lineNum, uint32_t ipcnt, uint
auto draw = ImGui::GetWindowDrawList(); auto draw = ImGui::GetWindowDrawList();
const auto w = ImGui::GetWindowWidth(); const auto w = ImGui::GetWindowWidth();
const auto wpos = ImGui::GetCursorScreenPos(); const auto wpos = ImGui::GetCursorScreenPos();
if( lineNum == m_selectedLine ) if( m_fileStringIdx == m_hoveredSource && lineNum == m_hoveredLine )
{
draw->AddRectFilled( wpos, wpos + ImVec2( w, ty+1 ), 0x22FFFFFF );
}
else if( lineNum == m_selectedLine )
{ {
draw->AddRectFilled( wpos, wpos + ImVec2( w, ty+1 ), 0xFF333322 ); draw->AddRectFilled( wpos, wpos + ImVec2( w, ty+1 ), 0xFF333322 );
} }
@ -1022,6 +1030,11 @@ void SourceView::RenderAsmLine( const AsmLine& line, uint32_t ipcnt, uint32_t ip
SelectAsmLines( srcidx.Idx(), srcline, worker, false ); SelectAsmLines( srcidx.Idx(), srcline, worker, false );
} }
} }
else
{
m_hoveredLine = srcline;
m_hoveredSource = srcidx.Idx();
}
} }
ImGui::SameLine( 0, 0 ); ImGui::SameLine( 0, 0 );
ImGui::ItemSize( ImVec2( stw * ( 32 - bufsz ), ty ), 0 ); ImGui::ItemSize( ImVec2( stw * ( 32 - bufsz ), ty ), 0 );

2
server/TracySourceView.hpp
View File

@ -80,6 +80,8 @@ private:
size_t m_dataSize; size_t m_dataSize;
int m_targetLine; int m_targetLine;
int m_selectedLine; int m_selectedLine;
DecayValue<int> m_hoveredLine;
DecayValue<uint32_t> m_hoveredSource;
int m_displayMode; int m_displayMode;
uint32_t m_codeLen; uint32_t m_codeLen;
DecayValue<uint64_t> m_highlightAddr; DecayValue<uint64_t> m_highlightAddr;