Merge pull request #27094 from RomanPudashkin/450_port_fixes

Porting some PRs to 4.5.0

Author: RomanPudashkin

src/engraving/dom/edit.cpp

@@ -4598,15 +4598,21 @@ void Score::cmdTimeDelete()
     }
 
     if (!isMaster() && masterScore()) {
-        Measure* masterStartMeas = masterScore()->tick2measure(startSegment->tick());
-        Measure* masterEndMeas = masterScore()->tick2measure(endSegment->tick());
-        if (endSegment->isEndBarLineType()) {
-            Measure* prevEndMeasure = masterEndMeas->prevMeasure();
-            masterEndMeas = prevEndMeasure ? prevEndMeasure : masterEndMeas;
-        }
-        Segment* masterStartSeg
-            = masterStartMeas ? masterStartMeas->findSegment(startSegment->segmentType(), startSegment->tick()) : startSegment;
-        Segment* masterEndSeg = masterEndMeas ? masterEndMeas->findSegment(endSegment->segmentType(), endSegment->tick()) : endSegment;
+        Fraction startTick = startSegment->tick();
+        Measure* masterStartMeas = masterScore()->tick2measure(startTick);
+        Segment* masterStartSeg = masterStartMeas->findSegment(startSegment->segmentType(), startSegment->tick());
+        Segment* masterEndSeg = nullptr;
+
+        if (endSegment) {
+            Fraction endTick = endSegment->tick();
+            Measure* masterEndMeas = masterScore()->tick2measure(endTick);
+            if (endSegment->isEndBarLineType()) {
+                Measure* prevMasterEndMeasure = masterEndMeas->prevMeasure();
+                masterEndMeas = prevMasterEndMeasure ? prevMasterEndMeasure : masterEndMeas;
+            }
+            masterEndSeg = masterEndMeas->findSegment(endSegment->segmentType(), endSegment->tick());
+        }
+
         masterScore()->doTimeDelete(masterStartSeg, masterEndSeg);
     } else {
         doTimeDelete(startSegment, endSegment);

src/engraving/dom/segment.cpp

@@ -1095,6 +1095,25 @@ void Segment::setXPosInSystemCoords(double x)
     mutldata()->setPosX(x - measure()->x());
 }
 
+bool Segment::isInsideTuplet() const
+{
+    if (!isChordRestType()) {
+        return false;
+    }
+
+    for (EngravingItem* item : m_elist) {
+        if (!item) {
+            continue;
+        }
+        ChordRest* chordRest = toChordRest(item);
+        if (chordRest->tuplet() && chordRest->tick() != chordRest->topTuplet()->tick()) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
 //---------------------------------------------------------
 //   swapElements
 //---------------------------------------------------------

src/engraving/dom/segment.h

@@ -320,6 +320,8 @@ class Segment final : public EngravingItem
     double xPosInSystemCoords() const;
     void setXPosInSystemCoords(double x);
 
+    bool isInsideTuplet() const;
+
 private:
 
     friend class Factory;

src/framework/vst/internal/synth/vstsequencer.cpp

@@ -106,8 +106,8 @@ void VstSequencer::updatePlaybackEvents(EventSequenceMap& destination, const mpe
 {
     SostenutoTimeAndDurations sostenutoTimeAndDurations;
 
-    for (const auto& pair : events) {
-        for (const mpe::PlaybackEvent& event : pair.second) {
+    for (const auto& evPair : events) {
+        for (const mpe::PlaybackEvent& event : evPair.second) {
             if (!std::holds_alternative<mpe::NoteEvent>(event)) {
                 continue;
             }
@@ -124,8 +124,8 @@ void VstSequencer::updatePlaybackEvents(EventSequenceMap& destination, const mpe
             destination[timestampFrom].emplace(buildEvent(VstEvent::kNoteOnEvent, noteId, velocityFraction, tuning));
             destination[timestampTo].emplace(buildEvent(VstEvent::kNoteOffEvent, noteId, velocityFraction, tuning));
 
-            for (const auto& pair : noteEvent.expressionCtx().articulations) {
-                const mpe::ArticulationMeta& meta = pair.second.meta;
+            for (const auto& articPair : noteEvent.expressionCtx().articulations) {
+                const mpe::ArticulationMeta& meta = articPair.second.meta;
 
                 if (muse::contains(BEND_SUPPORTED_TYPES, meta.type)) {
                     appendPitchBend(destination, noteEvent, meta);

src/notation/internal/excerptnotation.cpp

@@ -50,10 +50,6 @@ void ExcerptNotation::init()
 
     setScore(m_excerpt->excerptScore());
 
-    if (isEmpty()) {
-        fillWithDefaultInfo();
-    }
-
     m_inited = true;
 }
 
@@ -82,34 +78,6 @@ bool ExcerptNotation::isEmpty() const
     return m_excerpt->parts().empty();
 }
 
-void ExcerptNotation::fillWithDefaultInfo()
-{
-    TRACEFUNC;
-
-    IF_ASSERT_FAILED(m_excerpt || m_excerpt->excerptScore()) {
-        return;
-    }
-
-    mu::engraving::Score* score = m_excerpt->excerptScore();
-    mu::engraving::MeasureBase* topVerticalFrame = score->first();
-
-    if (topVerticalFrame && topVerticalFrame->isVBox()) {
-        topVerticalFrame->undoUnlink();
-    }
-
-    auto unlinkText = [&score](TextStyleType textType) {
-        engraving::Text* textItem = score->getText(textType);
-        if (textItem) {
-            textItem->undoUnlink();
-        }
-    };
-
-    unlinkText(TextStyleType::TITLE);
-    unlinkText(TextStyleType::SUBTITLE);
-    unlinkText(TextStyleType::COMPOSER);
-    unlinkText(TextStyleType::LYRICIST);
-}
-
 mu::engraving::Excerpt* ExcerptNotation::excerpt() const
 {
     return m_excerpt;

src/notation/internal/excerptnotation.h

@@ -55,7 +55,6 @@ class ExcerptNotation : public IExcerptNotation, public Notation, public std::en
     IExcerptNotationPtr clone() const override;
 
 private:
-    void fillWithDefaultInfo();
 
     mu::engraving::Excerpt* m_excerpt = nullptr;
     bool m_inited = false;

src/notation/internal/notationinteraction.cpp

@@ -1971,6 +1971,16 @@ bool NotationInteraction::dropRange(const QByteArray& data, const PointF& pos, b
         return false;
     }
 
+    if (segment->isInsideTuplet()) {
+        endDrop();
+        notifyAboutDropChanged();
+        //MScore::setError(MsError::DEST_TUPLET);
+        //MScoreErrorsController(iocContext()).checkAndShowMScoreError();
+        // NOTE: if we show the error popup here it seems that the mouse-release event is missed
+        // so the dragged region stays sticked to the mouse and move around. Don't know how to fix it. [M.S.]
+        return false;
+    }
+
     rdd.targetSegment = segment;
     rdd.targetStaffIdx = staffIdx;
 
@@ -2005,8 +2015,8 @@ bool NotationInteraction::dropRange(const QByteArray& data, const PointF& pos, b
     XmlReader e(data);
     score()->pasteStaff(e, segment, staffIdx);
 
-    apply();
     endDrop();
+    apply();
 
     MScoreErrorsController(iocContext()).checkAndShowMScoreError();
 
@@ -7289,7 +7299,8 @@ void NotationInteraction::addMelisma()
 
         score()->undoAddElement(melisma);
     } else if (prevPartialLyricsLine) {
-        const Fraction tickDiff = nextCR->tick() - prevPartialLyricsLine->tick2();
+        const Fraction segEndTick = segment->tick() + segment->ticks();
+        const Fraction tickDiff = segEndTick - prevPartialLyricsLine->tick2();
         prevPartialLyricsLine->undoMoveEnd(tickDiff);
         prevPartialLyricsLine->triggerLayout();
     }

src/notation/internal/notationparts.cpp

@@ -824,8 +824,14 @@ void NotationParts::moveSystemObjects(const ID& sourceStaffId, const ID& destina
             item->triggerLayout();
             continue;
         }
+
         if (item->staff() == srcStaff) {
-            item->undoChangeProperty(Pid::TRACK, staff2track(dstStaffIdx, item->voice()));
+            const track_idx_t trackIdx = staff2track(dstStaffIdx, item->voice());
+
+            item->undoChangeProperty(Pid::TRACK, trackIdx);
+            if (item->isSpanner()) {
+                item->undoChangeProperty(Pid::SPANNER_TRACK2, trackIdx);
+            }
         } else {
             item->undoUnlink();
             score()->undoRemoveElement(item, false /*removeLinked*/);