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

fix #100481: "Reset Beam Mode" on selection, or entire score

Browse source 
if no selection is given. Also optimize the outer loop of that function
to start with the 1st selected segment rather than the 1st segment of
the score.
This commit is contained in:
Joachim Schmitz 2016-03-02 22:08:20 +01:00
parent a6ec8aa170
commit 95f7707616
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libmscore/cmd.cpp
View file

@ -1692,20 +1692,18 @@ void Score::cmdAddStretch(qreal val)
void Score::cmdResetBeamMode()
{
if (!selection().isRange()) {
bool noSelection = selection().isNone();
if (noSelection)
cmdSelectAll();
else if (!selection().isRange()) {
qDebug("no system or staff selected");
return;
}
int startTick = selection().tickStart();
int endTick = selection().tickEnd();
Segment::Type st = Segment::Type::ChordRest;
for (Segment* seg = firstMeasure()->first(st); seg; seg = seg->next1(st)) {
if (seg->tick() < startTick)
continue;
if (seg->tick() >= endTick)
break;
for (int track = 0; track < nstaves() * VOICES; ++track) {
for (Segment* seg = selection().firstChordRestSegment(); seg && seg->tick() < endTick; seg = seg->next1(Segment::Type::ChordRest)) {
for (int track = selection().staffStart() * VOICES; track < selection().staffEnd() * VOICES; ++track) {
ChordRest* cr = static_cast<ChordRest*>(seg->element(track));
if (cr == 0)
continue;
@ -1720,6 +1718,8 @@ void Score::cmdResetBeamMode()
}
}
_layoutAll = true;
if (noSelection)
deselectAll();
}
//---------------------------------------------------------