diff --git a/server/TracyView.cpp b/server/TracyView.cpp index e3d0a5b0..d2e8b47c 100644 --- a/server/TracyView.cpp +++ b/server/TracyView.cpp @@ -11897,6 +11897,14 @@ uint32_t View::GetRawZoneColor( const GpuEvent& ev ) return GetZoneColor( ev ); } +uint32_t View::HighlightColor( uint32_t color ) +{ + return 0xFF000000 | + ( std::min( 0xFF, ( ( ( color & 0x00FF0000 ) >> 16 ) + 25 ) ) << 16 ) | + ( std::min( 0xFF, ( ( ( color & 0x0000FF00 ) >> 8 ) + 25 ) ) << 8 ) | + ( std::min( 0xFF, ( ( ( color & 0x000000FF ) ) + 25 ) ) ); +} + uint32_t View::GetZoneHighlight( const ZoneEvent& ev, uint64_t thread, int depth ) { if( m_zoneInfoWindow == &ev ) @@ -11913,11 +11921,7 @@ uint32_t View::GetZoneHighlight( const ZoneEvent& ev, uint64_t thread, int depth } else { - const auto color = GetZoneColor( ev, thread, depth ); - return 0xFF000000 | - ( std::min( 0xFF, ( ( ( color & 0x00FF0000 ) >> 16 ) + 25 ) ) << 16 ) | - ( std::min( 0xFF, ( ( ( color & 0x0000FF00 ) >> 8 ) + 25 ) ) << 8 ) | - ( std::min( 0xFF, ( ( ( color & 0x000000FF ) ) + 25 ) ) ); + return HighlightColor( GetZoneColor( ev, thread, depth ) ); } } diff --git a/server/TracyView.hpp b/server/TracyView.hpp index c2a2d3d7..b3946bcf 100644 --- a/server/TracyView.hpp +++ b/server/TracyView.hpp @@ -159,6 +159,7 @@ private: uint32_t GetZoneColor( const GpuEvent& ev ); uint32_t GetRawZoneColor( const ZoneEvent& ev, uint64_t thread, int depth ); uint32_t GetRawZoneColor( const GpuEvent& ev ); + uint32_t HighlightColor( uint32_t color ); uint32_t GetZoneHighlight( const ZoneEvent& ev, uint64_t thread, int depth ); uint32_t GetZoneHighlight( const GpuEvent& ev ); float GetZoneThickness( const ZoneEvent& ev );