Skip to content

Fix PianoRoll m_positionLine misalignment on zoom #5965

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Veratil merged 1 commit into from
Apr 15, 2021
Merged

Fix PianoRoll m_positionLine misalignment on zoom #5965

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/gui/editors/PianoRoll.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4444,11 +4444,16 @@ void PianoRoll::updatePosition( const TimePos & t )
{
autoScroll( t );
}
const int pos = m_timeLine->pos() * m_ppb / TimePos::ticksPerBar();
if (pos >= m_currentPosition && pos <= m_currentPosition + width() - m_whiteKeyWidth)
// ticks relative to m_currentPosition
// < 0 = outside viewport left
// > width = outside viewport right
Copy link
Contributor

@IanCaio IanCaio Mar 26, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// > width = outside viewport right
// > (width - piano keys width) = outside viewport right

const int pos = (static_cast<int>(m_timeLine->pos()) - m_currentPosition) * m_ppb / TimePos::ticksPerBar();
// if pos is within visible range, show it
if (pos >= 0 && pos <= width() - m_whiteKeyWidth)
{
m_positionLine->show();
m_positionLine->move(pos - (m_positionLine->width() - 1) - m_currentPosition + m_whiteKeyWidth, keyAreaTop());
// adjust pos for piano keys width and self line width (align to rightmost of line)
m_positionLine->move(pos + m_whiteKeyWidth - (m_positionLine->width() - 1), keyAreaTop());
}
else
{
Expand Down