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

Always return static thread color if dynamic colors are disabled.

Browse Source
This commit is contained in:
Bartosz Taudul 2019-09-16 20:31:32 +02:00
parent 5796f19a3b
commit 36b2b8f71f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/TracyView.cpp
View File

@ -11908,6 +11908,8 @@ uint32_t View::GetZoneColor( const ZoneEvent& ev, uint64_t thread, int depth )
uint32_t View::GetThreadColor( uint64_t thread, int depth ) uint32_t View::GetThreadColor( uint64_t thread, int depth )
{ {
if( !m_vd.dynamicColors ) return 0xFFCC5555;
const uint8_t h = thread & 0xFF; const uint8_t h = thread & 0xFF;
const uint8_t s = 96; const uint8_t s = 96;
const uint8_t v = std::max( 96, 170 - depth * 8 ); const uint8_t v = std::max( 96, 170 - depth * 8 );
@ -11939,7 +11941,6 @@ uint32_t View::GetRawZoneColor( const ZoneEvent& ev, uint64_t thread, int depth
const auto& srcloc = m_worker.GetSourceLocation( ev.SrcLoc() ); const auto& srcloc = m_worker.GetSourceLocation( ev.SrcLoc() );
const auto color = srcloc.color; const auto color = srcloc.color;
if( color != 0 ) return color | 0xFF000000; if( color != 0 ) return color | 0xFF000000;
if( !m_vd.dynamicColors ) return 0xFFCC5555;
return GetThreadColor( thread, depth ); return GetThreadColor( thread, depth );
} }