Skip to content

Allow ignoring snapped items via Alt key (fixes #28022) #30699

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −6
Open

Allow ignoring snapped items via Alt key (fixes #28022) #30699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 6 additions & 5 deletions src/engraving/dom/line.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ bool LineSegment::edit(EditData& ed)
return true;
}

undoMoveStartEndAndSnappedItems(moveStart, moveEnd, s1, s2);
undoMoveStartEndAndSnappedItems(ed, moveStart, moveEnd, s1, s2);

EditTimeTickAnchors::updateAnchors(this);
}
Expand Down Expand Up @@ -698,7 +698,7 @@ void LineSegment::rebaseAnchors(EditData& ed, Grip grip)
PointF oldStartPos = line()->linePos(Grip::START, &sys);
PointF oldEndPos = line()->linePos(Grip::END, &sys);

undoMoveStartEndAndSnappedItems(true, true, seg1, seg2);
undoMoveStartEndAndSnappedItems(ed, true, true, seg1, seg2);

rebaseOffsetsOnAnchorChanged(Grip::START, oldStartPos, sys);
rebaseOffsetsOnAnchorChanged(Grip::END, oldEndPos, sys);
Expand Down Expand Up @@ -855,12 +855,13 @@ double LineSegment::absoluteFromSpatium(const Spatium& sp) const
return line()->absoluteFromSpatium(sp);
}

void LineSegment::undoMoveStartEndAndSnappedItems(bool moveStart, bool moveEnd, Segment* s1, Segment* s2)
void LineSegment::undoMoveStartEndAndSnappedItems(EditData& ed, bool moveStart, bool moveEnd, Segment* s1, Segment* s2)
{
bool moveSnapped = !(ed.modifiers & AltModifier);
SLine* thisLine = line();
if (moveStart) {
Fraction tickDiff = s1->tick() - thisLine->tick();
if (EngravingItem* itemSnappedBefore = ldata()->itemSnappedBefore()) {
if (EngravingItem* itemSnappedBefore = ldata()->itemSnappedBefore(); itemSnappedBefore && moveSnapped) {
if (itemSnappedBefore->isTextBase()) {
MoveElementAnchors::moveSegment(itemSnappedBefore, s1, tickDiff);
} else if (itemSnappedBefore->isLineSegment()) {
Expand All @@ -873,7 +874,7 @@ void LineSegment::undoMoveStartEndAndSnappedItems(bool moveStart, bool moveEnd,
}
if (moveEnd) {
Fraction tickDiff = s2->tick() - thisLine->tick2();
if (EngravingItem* itemSnappedAfter = thisLine->backSegment()->ldata()->itemSnappedAfter()) {
if (EngravingItem* itemSnappedAfter = thisLine->backSegment()->ldata()->itemSnappedAfter(); itemSnappedAfter && moveSnapped) {
if (itemSnappedAfter->isTextBase()) {
MoveElementAnchors::moveSegment(itemSnappedAfter, s2, tickDiff);
} else if (itemSnappedAfter->isLineSegment()) {
Expand Down
2 changes: 1 addition & 1 deletion src/engraving/dom/line.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class LineSegment : public SpannerSegment
virtual void rebaseOffsetsOnAnchorChanged(Grip grip, const PointF& oldPos, System* sys);

private:
void undoMoveStartEndAndSnappedItems(bool moveStart, bool moveEnd, Segment* s1, Segment* s2);
void undoMoveStartEndAndSnappedItems(EditData& ed, bool moveStart, bool moveEnd, Segment* s1, Segment* s2);
PointF leftAnchorPosition(const double& systemPositionY) const;
PointF rightAnchorPosition(const double& systemPositionY) const;

Expand Down
Loading