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

Fix repeat start barline couldn't be replaced

Browse source
This commit is contained in:
bakajikara 2023-03-03 01:09:55 +09:00
parent 3ee6a91213
commit 17a2a84c55
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/engraving/libmscore/barline.cpp
View file

@ -81,6 +81,7 @@ static void undoChangeBarLineType(BarLine* bl, BarLineType barType, bool allStav
if (!m) { if (!m) {
return; return;
} }
bl = const_cast<BarLine*>(m->endBarLine());
} }
switch (barType) { switch (barType) {
@ -138,6 +139,9 @@ static void undoChangeBarLineType(BarLine* bl, BarLineType barType, bool allStav
} }
lmeasure->undoChangeProperty(Pid::REPEAT_END, false); lmeasure->undoChangeProperty(Pid::REPEAT_END, false);
if (lmeasure->nextMeasure() && !lmeasure->nextMeasure()->isFirstInSystem()) {
lmeasure->nextMeasure()->undoChangeProperty(Pid::REPEAT_START, false);
}
Segment* lsegment = lmeasure->undoGetSegmentR(SegmentType::EndBarLine, lmeasure->ticks()); Segment* lsegment = lmeasure->undoGetSegmentR(SegmentType::EndBarLine, lmeasure->ticks());
BarLine* lbl = toBarLine(lsegment->element(ltrack)); BarLine* lbl = toBarLine(lsegment->element(ltrack));
if (!lbl) { if (!lbl) {
@ -821,12 +825,6 @@ EngravingItem* BarLine::drop(EditData& data)
BarLine* bl = toBarLine(e); BarLine* bl = toBarLine(e);
BarLineType st = bl->barLineType(); BarLineType st = bl->barLineType();
// if no change in subtype or no change in span, do nothing
if (st == barLineType() && !bl->spanFrom() && !bl->spanTo()) {
delete e;
return 0;
}
// check if the new property can apply to this single bar line // check if the new property can apply to this single bar line
BarLineType bt = BarLineType::START_REPEAT | BarLineType::END_REPEAT | BarLineType::END_START_REPEAT; BarLineType bt = BarLineType::START_REPEAT | BarLineType::END_REPEAT | BarLineType::END_START_REPEAT;
bool oldRepeat = barLineType() & bt; bool oldRepeat = barLineType() & bt;