Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
45 changes: 33 additions & 12 deletions src/engraving/dom/anchors.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -299,23 +299,44 @@ Segment* MoveElementAnchors::findNewAnchorSegmentForLine(LineSegment* lineSegmen
}
}

if (ed.modifiers & ControlModifier) {
if (ed.key == Key_Left) {
Measure* measure = curSeg->rtick().isZero() ? curSeg->measure()->prevMeasure() : curSeg->measure();
return measure ? measure->findFirstR(SegmentType::ChordRest, Fraction(0, 1)) : nullptr;
}
if (ed.key == Key_Right) {
Measure* measure = curSeg->measure()->nextMeasure();
return measure ? measure->findFirstR(SegmentType::ChordRest, Fraction(0, 1)) : nullptr;
switch (ed.key) {
case Key_Left: {
if (ed.modifiers & ControlModifier) {
Measure* m = curSeg->rtick().isZero() ? curSeg->measure()->prevMeasure() : curSeg->measure();
return m ? m->findFirstR(SegmentType::ChordRest, Fraction(0, 1)) : nullptr;
}
}

if (ed.key == Key_Left) {
return findNewAnchorableSegment(curSeg, /*forward*/ false);
}
if (ed.key == Key_Right) {
case Key_Right: {
if (ed.modifiers & ControlModifier) {
if (Measure* measure = curSeg->measure()->nextMeasure()) {
return measure->findFirstR(SegmentType::ChordRest, Fraction(0, 1));
} else {
Measure* m = score->lastMeasure();
EditTimeTickAnchors::updateAnchors(m, lineSegment->staffIdx());
return m->getChordRestOrTimeTickSegment(m->endTick());
}
}
return findNewAnchorableSegment(curSeg, /*forward*/ true);
}
case Key_Home: {
Measure* m = curSeg->measure()->system()->firstMeasure();
if (curSeg->rtick() == Fraction(0, 1) && m == curSeg->measure() && m->prevMeasure()) {
m = m->prevMeasure()->system()->firstMeasure();
}
return m->findFirstR(SegmentType::ChordRest, Fraction(0, 1));
}
case Key_End: {
Measure* measure = curSeg->measure()->system()->lastMeasure()->nextMeasure();
if (measure) {
return measure->findFirstR(SegmentType::ChordRest, Fraction(0, 1));
} else {
Measure* m = score->lastMeasure();
EditTimeTickAnchors::updateAnchors(m, lineSegment->staffIdx());
return m->getChordRestOrTimeTickSegment(m->endTick());
}
}
}

return nullptr;
}
Expand Down
14 changes: 13 additions & 1 deletion src/engraving/dom/line.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ bool LineSegment::edit(EditData& ed)
} else {
s2 = MoveElementAnchors::findNewAnchorSegmentForLine(this, ed, s2);
}
if (s1 == 0 || s2 == 0 || s1->tick() >= s2->tick()) {
if (!s1 || !s2 || s1->tick() >= s2->tick()) {
return true;
}

Expand Down Expand Up @@ -358,6 +358,18 @@ bool LineSegment::edit(EditData& ed)
m2 = m2->nextMeasure();
}
}
} else if (ed.key == Key_Home) {
if (moveStart) {
m1 = m1->system()->firstMeasure();
} else if (moveEnd) {
m2 = m2->system()->firstMeasure();
}
} else if (ed.key == Key_End) {
if (moveStart) {
m1 = m1->system()->lastMeasure();
} else if (moveEnd) {
m2 = m2->system()->lastMeasure();
}
}
if (m1->tick() > m2->tick()) {
return true;
Expand Down
33 changes: 20 additions & 13 deletions src/engraving/dom/slur.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ bool SlurSegment::edit(EditData& ed)

const bool altMod = ed.modifiers & AltModifier;
const bool shiftMod = ed.modifiers & ShiftModifier;
const bool ctrlMod = ed.modifiers & ControlModifier;
const bool extendToBarLine = shiftMod && altMod;
const bool isPartialSlur = sl->isIncoming() || sl->isOutgoing();

Expand All @@ -153,13 +154,17 @@ bool SlurSegment::edit(EditData& ed)
sl->undoSetOutgoing(false);
}
} else {
if (start && sl->isIncoming()) {
sl->undoSetIncoming(false);
cr = prevChordRest(e, options);
} else if (!start && sl->isOutgoing()) {
if (!start && sl->isOutgoing()) {
sl->undoSetOutgoing(false);
} else {
cr = prevChordRest(e, options);
if (start && sl->isIncoming()) {
sl->undoSetIncoming(false);
}
if (ctrlMod) {
cr = score()->prevMeasure(cr, true);
} else {
cr = prevChordRest(e, options);
}
}
}
} else if (ed.key == Key_Right) {
Expand All @@ -177,22 +182,24 @@ bool SlurSegment::edit(EditData& ed)
} else {
if (start && sl->isIncoming()) {
sl->undoSetIncoming(false);
} else if (!start && sl->isOutgoing()) {
sl->undoSetOutgoing(false);
cr = nextChordRest(e, options);
} else {
cr = nextChordRest(e, options);
if (!start && sl->isOutgoing()) {
sl->undoSetOutgoing(false);
}
if (ctrlMod) {
cr = score()->nextMeasure(cr, false, true);
} else {
cr = nextChordRest(e, options);
}
}
}
} else if (ed.key == Key_Up) {
Part* part = e->part();
track_idx_t startTrack = part->startTrack();
track_idx_t startTrack = e->part()->startTrack();
track_idx_t endTrack = e->track();
cr = searchCR(e->segment(), endTrack, startTrack);
} else if (ed.key == Key_Down) {
track_idx_t startTrack = e->track() + 1;
Part* part = e->part();
track_idx_t endTrack = part->endTrack();
track_idx_t endTrack = e->part()->endTrack();
cr = searchCR(e->segment(), startTrack, endTrack);
} else {
return false;
Expand Down
Loading