LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix layout of crescendo line

Browse source
This commit is contained in:
Werner Schweer 2016-10-14 10:56:00 +02:00
parent 91eaf138eb
commit 78ff628bf2
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libmscore/hairpin.cpp
View file

@ -92,7 +92,6 @@ void HairpinSegment::layout()
if (autoplace()) {
qreal dx = sd->bbox().right() + sd->pos().x()
+ sd->segment()->pos().x() + sd->measure()->pos().x();
// hardcoded distance between Dynamic and Hairpin: 0.5sp
qreal dist = dx - pos().x() + score()->styleP(StyleIdx::autoplaceHairpinDynamicsDistance);
rUserXoffset() = dist;
rUserXoffset2() = -dist;
@ -108,7 +107,6 @@ void HairpinSegment::layout()
rUserXoffset2() -= ed->bbox().width();
qreal dx = ed->bbox().left() + ed->pos().x()
+ ed->segment()->pos().x() + ed->measure()->pos().x();
// hardcoded distance between Hairpin and Dynamic: 0.5sp
ed->rUserXoffset() = pos2().x() + pos().x() - dx + score()->styleP(StyleIdx::autoplaceHairpinDynamicsDistance);
}
else
@ -120,11 +118,11 @@ void HairpinSegment::layout()
if (type == HairpinType::DECRESC_LINE || type == HairpinType::CRESC_LINE) {
twoLines = false;
TextLineBaseSegment::layout();
drawCircledTip = false;
if (parent())
rypos() += score()->styleP(StyleIdx::hairpinY);
drawCircledTip = false;
circledTipRadius = 0.0;
}
else {
twoLines = true;
delete _text;
delete _endText;
_text = 0;
@ -146,7 +144,6 @@ void HairpinSegment::layout()
circledTipRadius = drawCircledTip ? 0.6 * _spatium * .5 : 0.0;
QLine l1, l2;
twoLines = true;
switch (type) {
case HairpinType::CRESC_HAIRPIN: {