mirror of
https://github.com/wolfpld/tracy
synced 2025-05-02 05:33:53 +00:00
Get rid of a non-linearity in TimelineItem resizing animation.
This commit is contained in:
parent
0cc6bb4ff9
commit
d6772900ad
@ -121,8 +121,8 @@ 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 = 5.0;
|
const auto speed = 4.0;
|
||||||
const auto minMove = 1.0;
|
const auto baseMove = 1.0;
|
||||||
|
|
||||||
const auto h = offset - oldOffset;
|
const auto h = offset - oldOffset;
|
||||||
if( firstFrame )
|
if( firstFrame )
|
||||||
@ -135,12 +135,12 @@ void TimelineItem::AdjustThreadHeight( bool firstFrame, int oldOffset, int& offs
|
|||||||
const auto preClampMove = diff * speed * ImGui::GetIO().DeltaTime;
|
const auto preClampMove = diff * speed * ImGui::GetIO().DeltaTime;
|
||||||
if( diff > 0 )
|
if( diff > 0 )
|
||||||
{
|
{
|
||||||
const auto move = std::max( minMove, preClampMove );
|
const auto move = preClampMove + baseMove;
|
||||||
m_height = int( std::min<double>( m_height + move, h ) );
|
m_height = int( std::min<double>( m_height + move, h ) );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
const auto move = std::min( -minMove, preClampMove );
|
const auto move = preClampMove - baseMove;
|
||||||
m_height = int( std::max<double>( m_height + move, h ) );
|
m_height = int( std::max<double>( m_height + move, h ) );
|
||||||
}
|
}
|
||||||
s_wasActive = true;
|
s_wasActive = true;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user