Skip to content

fix #8975 - Change how barline distance is used in order to avoid collisions in double bar lines #9138

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
merged 2 commits into from
Sep 23, 2021
Merged

fix #8975 - Change how barline distance is used in order to avoid collisions in double bar lines #9138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26925bb
change how width is calculated and drawn
asattely Sep 15, 2021
c8412b5
Change defaults to account for new distance interpretation
asattely Sep 16, 2021
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
64 changes: 33 additions & 31 deletions src/engraving/libmscore/barline.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,17 +662,17 @@ void BarLine::draw(mu::draw::Painter* painter) const

qreal lw2 = score()->styleP(Sid::endBarWidth) * mag();
painter->setPen(Pen(curColor(), lw2, PenStyle::SolidLine, PenCapStyle::FlatCap));
x += score()->styleP(Sid::endBarDistance) * mag();
x += ((lw * .5) + score()->styleP(Sid::endBarDistance) + (lw2 * .5)) * mag();
painter->drawLine(LineF(x, y1, x, y2));
}
break;

case BarLineType::DOUBLE: {
qreal lw2 = score()->styleP(Sid::doubleBarWidth) * mag();
painter->setPen(Pen(curColor(), lw2, PenStyle::SolidLine, PenCapStyle::FlatCap));
qreal x = lw2 * .5;
qreal lw = score()->styleP(Sid::doubleBarWidth) * mag();
painter->setPen(Pen(curColor(), lw, PenStyle::SolidLine, PenCapStyle::FlatCap));
qreal x = lw * .5;
painter->drawLine(LineF(x, y1, x, y2));
x += score()->styleP(Sid::doubleBarDistance) * mag();
x += ((lw * .5) + score()->styleP(Sid::doubleBarDistance) + (lw * .5)) * mag();
painter->drawLine(LineF(x, y1, x, y2));
}
break;
Expand All @@ -685,7 +685,7 @@ void BarLine::draw(mu::draw::Painter* painter) const

qreal lw2 = score()->styleP(Sid::barWidth) * mag();
painter->setPen(Pen(curColor(), lw2, PenStyle::SolidLine, PenCapStyle::FlatCap));
x += score()->styleP(Sid::endBarDistance) * mag();
x += ((lw * .5) + score()->styleP(Sid::endBarDistance) + (lw2 * .5)) * mag();
painter->drawLine(LineF(x, y1, x, y2));
}
break;
Expand All @@ -702,7 +702,7 @@ void BarLine::draw(mu::draw::Painter* painter) const
painter->setPen(Pen(curColor(), lw2, PenStyle::SolidLine, PenCapStyle::FlatCap));
qreal x = lw2 * .5;
painter->drawLine(LineF(x, y1, x, y2));
x += score()->styleP(Sid::endBarDistance) * mag();
x += ((lw2 * .5) + score()->styleP(Sid::endBarDistance) + (lw2 * .5)) * mag();
painter->drawLine(LineF(x, y1, x, y2));
}
break;
Expand All @@ -715,11 +715,10 @@ void BarLine::draw(mu::draw::Painter* painter) const

qreal lw = score()->styleP(Sid::barWidth) * mag();
painter->setPen(Pen(curColor(), lw, PenStyle::SolidLine, PenCapStyle::FlatCap));
x += score()->styleP(Sid::endBarDistance) * mag();
x += ((lw2 * .5) + score()->styleP(Sid::endBarDistance) + (lw * .5)) * mag();
painter->drawLine(LineF(x, y1, x, y2));

x += score()->styleP(Sid::repeatBarlineDotSeparation) * mag();
x -= symBbox(SymId::repeatDot).width() * .5;
x += ((lw * .5) + score()->styleP(Sid::repeatBarlineDotSeparation)) * mag();
drawDots(painter, x);

if (score()->styleB(Sid::repeatBarTips)) {
Expand All @@ -732,16 +731,15 @@ void BarLine::draw(mu::draw::Painter* painter) const
qreal lw = score()->styleP(Sid::barWidth) * mag();
painter->setPen(Pen(curColor(), lw, PenStyle::SolidLine, PenCapStyle::FlatCap));

qreal x = 0.0; // symBbox(SymId::repeatDot).width() * .5;
qreal x = 0.0;
drawDots(painter, x);

x += score()->styleP(Sid::repeatBarlineDotSeparation) * mag();
x += symBbox(SymId::repeatDot).width() * .5;
x += symBbox(SymId::repeatDot).width();
x += (score()->styleP(Sid::repeatBarlineDotSeparation) + (lw * .5)) * mag();
painter->drawLine(LineF(x, y1, x, y2));

x += score()->styleP(Sid::endBarDistance) * mag();

qreal lw2 = score()->styleP(Sid::endBarWidth) * mag();
x += ((lw * .5) + score()->styleP(Sid::endBarDistance) + (lw2 * .5)) * mag();
painter->setPen(Pen(curColor(), lw2, PenStyle::SolidLine, PenCapStyle::FlatCap));
painter->drawLine(LineF(x, y1, x, y2));

Expand All @@ -754,16 +752,15 @@ void BarLine::draw(mu::draw::Painter* painter) const
qreal lw = score()->styleP(Sid::barWidth) * mag();
painter->setPen(Pen(curColor(), lw, PenStyle::SolidLine, PenCapStyle::FlatCap));

qreal x = 0.0; // symBbox(SymId::repeatDot).width() * .5;
qreal x = 0.0;
drawDots(painter, x);

x += score()->styleP(Sid::repeatBarlineDotSeparation) * mag();
x += symBbox(SymId::repeatDot).width() * .5;
x += symBbox(SymId::repeatDot).width();
x += (score()->styleP(Sid::repeatBarlineDotSeparation) + (lw * .5)) * mag();
painter->drawLine(LineF(x, y1, x, y2));

x += score()->styleP(Sid::endBarDistance) * mag();

qreal lw2 = score()->styleP(Sid::endBarWidth) * mag();
x += ((lw * .5) + score()->styleP(Sid::endBarDistance) + (lw2 * .5)) * mag();
painter->setPen(Pen(curColor(), lw2, PenStyle::SolidLine, PenCapStyle::FlatCap));
painter->drawLine(LineF(x, y1, x, y2));

Expand All @@ -772,11 +769,10 @@ void BarLine::draw(mu::draw::Painter* painter) const
}

painter->setPen(Pen(curColor(), lw, PenStyle::SolidLine, PenCapStyle::FlatCap));
x += score()->styleP(Sid::endBarDistance) * mag();
x += ((lw2 * .5) + score()->styleP(Sid::endBarDistance) + (lw * .5)) * mag();
painter->drawLine(LineF(x, y1, x, y2));

x += score()->styleP(Sid::repeatBarlineDotSeparation) * mag();
x -= symBbox(SymId::repeatDot).width() * .5;
x += ((lw * .5) + score()->styleP(Sid::repeatBarlineDotSeparation)) * mag();
drawDots(painter, x);

if (score()->styleB(Sid::repeatBarTips)) {
Expand Down Expand Up @@ -1181,26 +1177,32 @@ qreal BarLine::layoutWidth(Score* score, BarLineType type)
qreal w { 0.0 };
switch (type) {
case BarLineType::DOUBLE:
w = score->styleP(Sid::doubleBarWidth) + score->styleP(Sid::doubleBarDistance);
w = (score->styleP(Sid::doubleBarWidth) * 2)
+ score->styleP(Sid::doubleBarDistance);
break;
case BarLineType::DOUBLE_HEAVY:
w = score->styleP(Sid::endBarWidth) + score->styleP(Sid::endBarDistance);
w = (score->styleP(Sid::endBarWidth) * 2)
+ score->styleP(Sid::endBarDistance);
break;
case BarLineType::END_START_REPEAT:
w = score->styleP(Sid::endBarDistance) * 2
+ score->styleP(Sid::repeatBarlineDotSeparation) * 2
+ dotwidth;
w = score->styleP(Sid::endBarWidth)
+ (score->styleP(Sid::barWidth) * 2)
+ (score->styleP(Sid::endBarDistance) * 2)
+ (score->styleP(Sid::repeatBarlineDotSeparation) * 2)
+ (dotwidth * 2);
break;
case BarLineType::START_REPEAT:
case BarLineType::END_REPEAT:
w = score->styleP(Sid::endBarWidth) * .5
w = score->styleP(Sid::endBarWidth)
+ score->styleP(Sid::barWidth)
+ score->styleP(Sid::endBarDistance)
+ score->styleP(Sid::repeatBarlineDotSeparation)
+ dotwidth * .5;
+ dotwidth;
break;
case BarLineType::END:
case BarLineType::REVERSE_END:
w = (score->styleP(Sid::endBarWidth) + score->styleP(Sid::barWidth)) * .5
w = score->styleP(Sid::endBarWidth)
+ score->styleP(Sid::barWidth)
+ score->styleP(Sid::endBarDistance);
break;
case BarLineType::BROKEN:
Expand Down
6 changes: 3 additions & 3 deletions src/engraving/style/styledef.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,9 @@ const StyleDef::StyleValue StyleDef::styleValues[int(Sid::STYLES)] = {
{ Sid::doubleBarWidth, "doubleBarWidth", Spatium(0.18) },

{ Sid::endBarWidth, "endBarWidth", Spatium(0.55) },
{ Sid::doubleBarDistance, "doubleBarDistance", Spatium(0.55) },
{ Sid::endBarDistance, "endBarDistance", Spatium(0.7) },
{ Sid::repeatBarlineDotSeparation, "repeatBarlineDotSeparation", Spatium(0.7) },
{ Sid::doubleBarDistance, "doubleBarDistance", Spatium(0.37) },
{ Sid::endBarDistance, "endBarDistance", Spatium(0.37) },
{ Sid::repeatBarlineDotSeparation, "repeatBarlineDotSeparation", Spatium(0.52) },
{ Sid::repeatBarTips, "repeatBarTips", QVariant(false) },
{ Sid::startBarlineSingle, "startBarlineSingle", QVariant(false) },
{ Sid::startBarlineMultiple, "startBarlineMultiple", QVariant(true) },
Expand Down