Skip to content

Shadow note couple fixes #14816

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
RomanPudashkin merged 2 commits into from
Dec 20, 2022
Merged

Shadow note couple fixes #14816

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4973ffe
ledger lines distance respect staff lines distance
sammik Nov 27, 2022
82448b2
fix ledgerline width and dotted rest dot position
sammik Nov 28, 2022
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
14 changes: 8 additions & 6 deletions src/engraving/libmscore/shadownote.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ void ShadowNote::draw(mu::draw::Painter* painter) const
posDot.rx() += (noteheadWidth + d);

if (m_isRest) {
posDot.ry() += Rest::getDotline(m_duration.type()) * sp2 * mag();
posDot.ry() += Rest::getDotline(m_duration.type()) * sp2;
} else {
posDot.ry() -= (m_lineIndex % 2 == 0 ? sp2 : 0);
}
Expand Down Expand Up @@ -178,21 +178,22 @@ void ShadowNote::draw(mu::draw::Painter* painter) const

// Draw ledger lines if needed
if (!m_isRest && m_lineIndex < 100 && m_lineIndex > -100) {
double extraLen = score()->styleS(Sid::ledgerLineLength).val() * sp * mag();
double extraLen = score()->styleS(Sid::ledgerLineLength).val() * sp;
double x1 = -extraLen;
double x2 = noteheadWidth + extraLen;
double step = sp2 * staffType()->lineDistance().val();

lw = score()->styleMM(Sid::ledgerLineWidth) * mag();
pen.setWidthF(lw);
painter->setPen(pen);

for (int i = -2; i >= m_lineIndex; i -= 2) {
double y = sp2 * (i - m_lineIndex);
double y = step * (i - m_lineIndex);
painter->drawLine(LineF(x1, y, x2, y));
}
int l = staffType()->lines() * 2; // first ledger line below staff
for (int i = l; i <= m_lineIndex; i += 2) {
double y = sp2 * (i - m_lineIndex);
double y = step * (i - m_lineIndex);
painter->drawLine(LineF(x1, y, x2, y));
}
}
Expand Down Expand Up @@ -323,6 +324,7 @@ void ShadowNote::layout()
// Layout ledger lines if needed
if (!m_isRest && m_lineIndex < 100 && m_lineIndex > -100) {
double extraLen = score()->styleMM(Sid::ledgerLineLength) * mag();
double step = 0.5 * _spatium * staffType()->lineDistance().val();
double x = noteheadBbox.x() - extraLen;
double w = noteheadBbox.width() + 2 * extraLen;

Expand All @@ -331,11 +333,11 @@ void ShadowNote::layout()
InputState ps = score()->inputState();
RectF r(x, -lw * .5, w, lw);
for (int i = -2; i >= m_lineIndex; i -= 2) {
newBbox |= r.translated(PointF(0, _spatium * .5 * (i - m_lineIndex)));
newBbox |= r.translated(PointF(0, step * (i - m_lineIndex)));
}
int l = staffType()->lines() * 2; // first ledger line below staff
for (int i = l; i <= m_lineIndex; i += 2) {
newBbox |= r.translated(PointF(0, _spatium * .5 * (i - m_lineIndex)));
newBbox |= r.translated(PointF(0, step * (i - m_lineIndex)));
}
}
setbbox(newBbox);
Expand Down