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

Change resize logic such that TimelineItem instances "don't chase" each other anymore.

Browse Source
This commit is contained in:
Tomaž Vöröš 2022-12-18 20:06:10 +01:00
parent b80ede3ec6
commit db6acfe9b5
2 changed files with 17 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
server/TracyTimelineItem.cpp
View File

@ -12,7 +12,6 @@ TimelineItem::TimelineItem( View& view, Worker& worker )
: m_visible( true ) : m_visible( true )
, m_showFull( true ) , m_showFull( true )
, m_height( 0 ) , m_height( 0 )
, m_offset( 0 )
, m_view( view ) , m_view( view )
, m_worker( worker ) , m_worker( worker )
{ {
@ -22,8 +21,8 @@ void TimelineItem::Draw( bool firstFrame, double pxns, int& offset, const ImVec2
{ {
if( !IsVisible() ) if( !IsVisible() )
{ {
m_height = 0; if( m_height != 0 )
m_offset = 0; AdjustThreadHeight( firstFrame, offset, offset );
return; return;
} }
if( IsEmpty() ) return; if( IsEmpty() ) return;
@ -31,7 +30,7 @@ void TimelineItem::Draw( bool firstFrame, double pxns, int& offset, const ImVec2
const auto w = ImGui::GetContentRegionAvail().x - 1; const auto w = ImGui::GetContentRegionAvail().x - 1;
const auto ty = ImGui::GetTextLineHeight(); const auto ty = ImGui::GetTextLineHeight();
const auto ostep = ty + 1; const auto ostep = ty + 1;
const auto yPos = AdjustThreadPosition( wpos.y, offset ); const auto yPos = wpos.y + offset;
const auto dpos = wpos + ImVec2( 0.5f, 0.5f ); const auto dpos = wpos + ImVec2( 0.5f, 0.5f );
const auto oldOffset = offset; const auto oldOffset = offset;
auto draw = ImGui::GetWindowDrawList(); auto draw = ImGui::GetWindowDrawList();
@ -44,9 +43,8 @@ void TimelineItem::Draw( bool firstFrame, double pxns, int& offset, const ImVec2
{ {
if( !DrawContents( pxns, offset, wpos, hover, yMin, yMax ) && !m_view.GetViewData().drawEmptyLabels ) if( !DrawContents( pxns, offset, wpos, hover, yMin, yMax ) && !m_view.GetViewData().drawEmptyLabels )
{ {
m_height = 0;
m_offset = 0;
offset = oldOffset; offset = oldOffset;
AdjustThreadHeight( firstFrame, oldOffset, offset );
ImGui::PopClipRect(); ImGui::PopClipRect();
ImGui::PopID(); ImGui::PopID();
return; return;
@ -123,44 +121,31 @@ void TimelineItem::Draw( bool firstFrame, double pxns, int& offset, const ImVec2
void TimelineItem::AdjustThreadHeight( bool firstFrame, int oldOffset, int& offset ) void TimelineItem::AdjustThreadHeight( bool firstFrame, int oldOffset, int& offset )
{ {
const auto speed = 10.0;
const auto minMove = 2.0;
const auto h = offset - oldOffset; const auto h = offset - oldOffset;
if( m_height > h ) if( firstFrame )
{ {
m_height = h; m_height = h;
offset = oldOffset + m_height;
} }
else if( m_height < h ) else if( m_height != h )
{ {
if( firstFrame ) const auto diff = h - m_height;
const auto preClampMove = diff * speed * ImGui::GetIO().DeltaTime;
if( diff > 0 )
{ {
m_height = h; const auto move = std::max( minMove, preClampMove );
offset = oldOffset + h; m_height = int( std::min<double>( m_height + move, h ) );
} }
else else
{ {
const auto diff = h - m_height; const auto move = std::min( -minMove, preClampMove );
const auto move = std::max( 2.0, diff * 10.0 * ImGui::GetIO().DeltaTime ); m_height = int( std::max<double>( m_height + move, h ) );
m_height = int( std::min<double>( m_height + move, h ) );
offset = oldOffset + m_height;
s_wasActive = true;
} }
}
}
float TimelineItem::AdjustThreadPosition( float wy, int& offset )
{
if( m_offset < offset )
{
m_offset = offset;
}
else if( m_offset > offset )
{
const auto diff = m_offset - offset;
const auto move = std::max( 2.0, diff * 10.0 * ImGui::GetIO().DeltaTime );
offset = m_offset = int( std::max<double>( m_offset - move, offset ) );
s_wasActive = true; s_wasActive = true;
} }
return offset + wy; offset = oldOffset + m_height;
} }
void TimelineItem::VisibilityCheckbox() void TimelineItem::VisibilityCheckbox()

2
server/TracyTimelineItem.hpp
View File

@ -47,10 +47,8 @@ protected:
private: private:
void AdjustThreadHeight( bool firstFrame, int oldOffset, int& offset ); void AdjustThreadHeight( bool firstFrame, int oldOffset, int& offset );
float AdjustThreadPosition( float wy, int& offset );
int m_height; int m_height;
int m_offset;
protected: protected:
View& m_view; View& m_view;