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

fix #286948: horizontal tie normally

Browse source
This commit is contained in:
Marc Sabatella 2019-03-30 17:21:25 -06:00
parent a9d043ae3f
commit 8fbd3e04d3
2 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libmscore/measure.cpp
View file

@ -658,16 +658,12 @@ void Measure::layout2()
Chord* c = toChord(cr);
for (const Note* note : c->notes()) {
Tie* t = note->tieFor();
if (t) {
TieSegment* ts = t->layoutFor(system());
//system->staff(ch->staffIdx())->skyline().add(ts->shape().translated(ts->pos()));
}
if (t)
t->layoutFor(system());
t = note->tieBack();
if (t) {
if (t->startNote()->tick() < stick) {
TieSegment* ts = t->layoutBack(system());
//system->staff(ch->staffIdx())->skyline().add(ts->shape().translated(ts->pos()));
}
if (t->startNote()->tick() < stick)
t->layoutBack(system());
}
for (Spanner* sp : note->spannerFor())
sp->layout();

12
libmscore/tie.cpp
View file

@ -490,18 +490,24 @@ void Tie::slurPos(SlurPos* sp)
else
sp->system2 = ec->measure()->system();
// force tie to be horizontal except for cross-staff or if there is a difference of enharmonic spelling
bool horizontal = startNote()->tpc() == endNote()->tpc() && sc->vStaffIdx() == ec->vStaffIdx();
hw = endNote()->tabHeadWidth(stt);
if ((ec->notes().size() > 1) || (ec->stem() && !ec->up() && !_up)) {
xo = endNote()->x() - hw * 0.12;
yo = endNote()->pos().y() + yOffInside;
if (!horizontal)
yo = endNote()->pos().y() + yOffInside;
}
else if (shortStart) {
xo = endNote()->x() + hw * 0.15;
yo = endNote()->pos().y() + yOffOutside;
if (!horizontal)
yo = endNote()->pos().y() + yOffOutside;
}
else {
xo = endNote()->x() + hw * 0.35;
yo = endNote()->pos().y() + yOffOutside;
if (!horizontal)
yo = endNote()->pos().y() + yOffOutside;
}
sp->p2 += QPointF(xo, yo);