mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-13 03:41:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Highlight selected/hovered lock.

Browse Source
This commit is contained in:
Bartosz Taudul 2019-02-17 16:20:56 +01:00
parent d4fb6fde2b
commit ea4f4ebb3a
2 changed files with 47 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
server/TracyView.cpp
View File

@ -1695,6 +1695,7 @@ void View::DrawZones()
{ {
m_msgHighlight.Decay( nullptr ); m_msgHighlight.Decay( nullptr );
m_zoneSrcLocHighlight.Decay( 0 ); m_zoneSrcLocHighlight.Decay( 0 );
m_lockHoverHighlight.Decay( InvalidId );
if( m_zvStart == m_zvEnd ) return; if( m_zvStart == m_zvEnd ) return;
assert( m_zvStart < m_zvEnd ); assert( m_zvStart < m_zvEnd );
@ -2851,6 +2852,17 @@ int View::DrawLocks( uint64_t tid, bool hover, double pxns, const ImVec2& wpos,
const auto offset = _offset + ostep * cnt; const auto offset = _offset + ostep * cnt;
if( m_lockInfoWindow == v.first )
{
draw->AddRectFilled( wpos + ImVec2( 0, offset ), wpos + ImVec2( w, offset + ty ), 0x2288DD88 );
draw->AddRect( wpos + ImVec2( 0, offset ), wpos + ImVec2( w, offset + ty ), 0x4488DD88 );
}
else if( m_lockHoverHighlight == v.first )
{
draw->AddRectFilled( wpos + ImVec2( 0, offset ), wpos + ImVec2( w, offset + ty ), 0x228888DD );
draw->AddRect( wpos + ImVec2( 0, offset ), wpos + ImVec2( w, offset + ty ), 0x448888DD );
}
LockState state = LockState::Nothing; LockState state = LockState::Nothing;
if( lockmap.type == LockType::Lockable ) if( lockmap.type == LockType::Lockable )
{ {
@ -3266,12 +3278,16 @@ int View::DrawLocks( uint64_t tid, bool hover, double pxns, const ImVec2& wpos,
vbegin = next; vbegin = next;
} }
if( drawn ) if( drawn || m_lockInfoWindow == v.first )
{ {
char buf[1024]; char buf[1024];
sprintf( buf, "%" PRIu32 ": %s", v.first, m_worker.GetString( srcloc.function ) ); sprintf( buf, "%" PRIu32 ": %s", v.first, m_worker.GetString( srcloc.function ) );
DrawTextContrast( draw, wpos + ImVec2( 0, offset ), 0xFF8888FF, buf ); DrawTextContrast( draw, wpos + ImVec2( 0, offset ), 0xFF8888FF, buf );
if( hover && ImGui::IsMouseHoveringRect( wpos + ImVec2( 0, offset ), wpos + ImVec2( ty + ImGui::CalcTextSize( buf ).x, offset + ty ) ) ) if( hover && ImGui::IsMouseHoveringRect( wpos + ImVec2( 0, offset ), wpos + ImVec2( w, offset + ty ) ) )
{
m_lockHoverHighlight = v.first;
if( ImGui::IsMouseHoveringRect( wpos + ImVec2( 0, offset ), wpos + ImVec2( ty + ImGui::CalcTextSize( buf ).x, offset + ty ) ) )
{ {
ImGui::BeginTooltip(); ImGui::BeginTooltip();
switch( v.second.type ) switch( v.second.type )
@ -3304,6 +3320,7 @@ int View::DrawLocks( uint64_t tid, bool hover, double pxns, const ImVec2& wpos,
m_lockInfoWindow = v.first; m_lockInfoWindow = v.first;
} }
} }
}
cnt++; cnt++;
} }
} }

1
server/TracyView.hpp
View File

@ -238,6 +238,7 @@ private:
DecayValue<uint64_t> m_zoneSrcLocHighlight = 0; DecayValue<uint64_t> m_zoneSrcLocHighlight = 0;
LockHighlight m_lockHighlight { -1 }; LockHighlight m_lockHighlight { -1 };
DecayValue<const MessageData*> m_msgHighlight = nullptr; DecayValue<const MessageData*> m_msgHighlight = nullptr;
DecayValue<uint32_t> m_lockHoverHighlight = InvalidId;
const MessageData* m_msgToFocus = nullptr; const MessageData* m_msgToFocus = nullptr;
const GpuEvent* m_gpuInfoWindow = nullptr; const GpuEvent* m_gpuInfoWindow = nullptr;
const GpuEvent* m_gpuHighlight; const GpuEvent* m_gpuHighlight;