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

Hide timeline item if it had no content.

Browse Source
This commit is contained in:
Bartosz Taudul 2022-09-03 21:57:56 +02:00
parent 3780c47bb6
commit d65bde99a2
No known key found for this signature in database
GPG Key ID: B7FE2008B7575DF3
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
server/TracyTimelineItem.cpp
View File

@ -39,7 +39,22 @@ void TimelineItem::Draw( bool firstFrame, double pxns, int& offset, const ImVec2
ImGui::PushID( this ); ImGui::PushID( this );
ImGui::PushClipRect( wpos + ImVec2( 0, offset ), wpos + ImVec2( w, offset + m_height ), true ); ImGui::PushClipRect( wpos + ImVec2( 0, offset ), wpos + ImVec2( w, offset + m_height ), true );
offset += ostep;
if( m_showFull )
{
if( !DrawContents( pxns, offset, wpos, hover, yMin, yMax ) && !m_view.GetViewData().drawEmptyLabels )
{
m_height = 0;
m_offset = 0;
offset = oldOffset;
ImGui::PopClipRect();
ImGui::PopID();
return;
}
}
float labelWidth; float labelWidth;
const auto hdrOffset = oldOffset;
const bool drawHeader = yPos + ty >= yMin && yPos <= yMax; const bool drawHeader = yPos + ty >= yMin && yPos <= yMax;
if( drawHeader ) if( drawHeader )
{ {
@ -48,21 +63,22 @@ void TimelineItem::Draw( bool firstFrame, double pxns, int& offset, const ImVec2
if( m_showFull ) if( m_showFull )
{ {
DrawTextContrast( draw, wpos + ImVec2( 0, offset ), color, ICON_FA_CARET_DOWN ); DrawTextContrast( draw, wpos + ImVec2( 0, hdrOffset ), color, ICON_FA_CARET_DOWN );
} }
else else
{ {
DrawTextContrast( draw, wpos + ImVec2( 0, offset ), colorInactive, ICON_FA_CARET_RIGHT ); DrawTextContrast( draw, wpos + ImVec2( 0, hdrOffset ), colorInactive, ICON_FA_CARET_RIGHT );
} }
const auto label = HeaderLabel(); const auto label = HeaderLabel();
labelWidth = ImGui::CalcTextSize( label ).x; labelWidth = ImGui::CalcTextSize( label ).x;
DrawTextContrast( draw, wpos + ImVec2( ty, offset ), m_showFull ? color : colorInactive, label ); DrawTextContrast( draw, wpos + ImVec2( ty, hdrOffset ), m_showFull ? color : colorInactive, label );
if( m_showFull ) if( m_showFull )
{ {
DrawLine( draw, dpos + ImVec2( 0, offset + ty - 1 ), dpos + ImVec2( w, offset + ty - 1 ), HeaderLineColor() ); DrawLine( draw, dpos + ImVec2( 0, hdrOffset + ty - 1 ), dpos + ImVec2( w, hdrOffset + ty - 1 ), HeaderLineColor() );
HeaderExtraContents( hdrOffset, wpos, labelWidth, hover );
} }
if( hover && ImGui::IsMouseHoveringRect( wpos + ImVec2( 0, offset ), wpos + ImVec2( ty + labelWidth, offset + ty ) ) ) if( hover && ImGui::IsMouseHoveringRect( wpos + ImVec2( 0, hdrOffset ), wpos + ImVec2( ty + labelWidth, hdrOffset + ty ) ) )
{ {
HeaderTooltip( label ); HeaderTooltip( label );
@ -91,17 +107,6 @@ void TimelineItem::Draw( bool firstFrame, double pxns, int& offset, const ImVec2
ImGui::EndPopup(); ImGui::EndPopup();
} }
auto hdrOffset = offset;
offset += ostep;
if( m_showFull )
{
DrawContents( pxns, offset, wpos, hover, yMin, yMax );
if( drawHeader )
{
HeaderExtraContents( hdrOffset, wpos, labelWidth, hover );
}
}
offset += 0.2f * ostep; offset += 0.2f * ostep;
AdjustThreadHeight( firstFrame, oldOffset, offset ); AdjustThreadHeight( firstFrame, oldOffset, offset );