Porting 4.7 PRs to master (3)

src/engraving/dom/instrument.cpp

@@ -806,6 +806,28 @@ void Instrument::setGlissandoStyle(GlissandoStyle style)
 bool Instrument::operator==(const Instrument& i) const
 {
     bool equal = i.m_instrumentName == m_instrumentName;
+    equal &= i.m_trackName == m_trackName;
+    equal &= i.m_id == m_id;
+    equal &= i.m_soundId == m_soundId;
+    equal &= i.m_musicXmlId == m_musicXmlId;
+
+    equal &= i.m_minPitchA == m_minPitchA;
+    equal &= i.m_maxPitchA == m_maxPitchA;
+    equal &= i.m_minPitchP == m_minPitchP;
+    equal &= i.m_maxPitchP == m_maxPitchP;
+    equal &= i.m_transpose.diatonic == m_transpose.diatonic;
+    equal &= i.m_transpose.chromatic == m_transpose.chromatic;
+
+    equal &= i.m_useDrumset == m_useDrumset;
+    if (i.m_drumset && m_drumset) {
+        equal &= *i.m_drumset == *m_drumset;
+    } else {
+        equal &= i.m_drumset == m_drumset;
+    }
+    equal &= *i.stringData() == *stringData();
+
+    equal &= i.m_midiActions == m_midiActions;
+    equal &= i.m_articulation == m_articulation;
 
     if (i.m_channel.size() == m_channel.size()) {
         for (size_t cur = 0; cur < m_channel.size(); cur++) {
@@ -817,17 +839,8 @@ bool Instrument::operator==(const Instrument& i) const
         return false;
     }
 
-    equal &= i.m_minPitchA == m_minPitchA;
-    equal &= i.m_maxPitchA == m_maxPitchA;
-    equal &= i.m_minPitchP == m_minPitchP;
-    equal &= i.m_maxPitchP == m_maxPitchP;
-    equal &= i.m_useDrumset == m_useDrumset;
-    equal &= i.m_midiActions == m_midiActions;
-    equal &= i.m_articulation == m_articulation;
-    equal &= i.m_transpose.diatonic == m_transpose.diatonic;
-    equal &= i.m_transpose.chromatic == m_transpose.chromatic;
-    equal &= i.m_trackName == m_trackName;
-    equal &= *i.stringData() == *stringData();
+    equal &= i.m_clefType == m_clefType;
+
     equal &= i.m_singleNoteDynamics == m_singleNoteDynamics;
 
     return equal;

src/engraving/editing/cmd.cpp

@@ -1499,21 +1499,11 @@ bool Score::makeGap1(const Fraction& baseTick, staff_idx_t staffIdx, const Fract
         if (newLen > Fraction(0, 1)) {
             const Fraction endTick = tick + actualTicks(newLen, nullptr, staff(staffIdx)->timeStretch(tick));
 
-            // Delete annotations that require an anchor to the previous segment
-            Segment* s1 = tick2rightSegment(tick);
-            Segment* s2 = tick2rightSegment(endTick);
-            if (s1 && s2 && (*s2) > (*s1)) {
-                for (Segment* s = s1; s && s != s2; s = s->next1()) {
-                    const auto annotations = s->annotations(); // make a copy since we alter the list
-                    for (EngravingItem* annotation : annotations) {
-                        if (!annotation->systemFlag() && !annotation->allowTimeAnchor() && annotation->track() == track) {
-                            deleteItem(annotation);
-                        }
-                    }
-                }
-            }
-
             SelectionFilter filter;
+            // chord symbols can exist without chord/rest so they should not be removed
+            filter.setFiltered(ElementsSelectionFilterTypes::CHORD_SYMBOL, false);
+
+            deleteAnnotationsFromRange(tick2rightSegment(tick), tick2rightSegment(endTick), track, track + 1, filter);
             deleteOrShortenOutSpannersFromRange(tick, endTick, track, track + 1, filter);
         }
 

src/notation/internal/notationnoteinput.cpp

@@ -766,7 +766,7 @@ muse::RectF NotationNoteInput::cursorRect() const
     }
 
     const mu::engraving::track_idx_t track = inputState.track() == muse::nidx ? 0 : inputState.track();
-    const mu::engraving::staff_idx_t staffIdx = track / mu::engraving::VOICES;
+    const mu::engraving::staff_idx_t staffIdx = track2staff(track);
 
     const Staff* staff = score()->staff(staffIdx);
     if (!staff) {
@@ -783,6 +783,12 @@ muse::RectF NotationNoteInput::cursorRect() const
 
     const RectF segmentContentRect = ::segmentContentRect(segment, track);
     double x = segmentContentRect.x() + segment->pagePos().x();
+
+    const double barNoteDist = score()->style().styleAbsolute(Sid::barNoteDistance);
+    if (segment->x() < barNoteDist) {
+        x += barNoteDist - segment->x();
+    }
+
     double y = system->staffCanvasYpage(staffIdx);
     double w = segmentContentRect.width() > 0 ? segmentContentRect.width() : defaultWidth;
     double h = 0.0;

src/notationscene/widgets/editstaff.cpp

@@ -139,8 +139,9 @@ void EditStaff::setStaff(Staff* s, const Fraction& tick)
     m_tick = Fraction::fromTicks(m_orgStaff->staffTypeRange(tick).first);
     mu::engraving::StaffType* stt = m_staff->setStaffType(m_tick, *orgStaffType);
 
-    m_staff->setUserDist(m_orgStaff->userDist());
     m_staff->setPart(part);
+    m_staff->setDefaultClefType(m_orgStaff->defaultClefType());
+    m_staff->setUserDist(m_orgStaff->userDist());
     m_staff->setCutaway(m_orgStaff->cutaway());
     m_staff->setHideWhenEmpty(m_orgStaff->hideWhenEmpty());
     m_staff->setShowIfEntireSystemEmpty(m_orgStaff->showIfEntireSystemEmpty());
@@ -504,7 +505,7 @@ void EditStaff::applyStaffProperties()
     config.userDistance = Spatium(spinExtraDistance->value());
     config.hideSystemBarline = hideSystemBarLine->isChecked();
     config.mergeMatchingRests = static_cast<AutoOnOff>(mergeMatchingRests->currentIndex());
-    config.clefTypeList = m_instrument.clefType(m_orgStaff->rstaff());
+    config.clefTypeList = m_staff->defaultClefType();
     config.staffType = *m_staff->staffType(m_tick);
     config.reflectTranspositionInLinkedTab = !noReflectTranspositionInLinkedTab->isChecked();
 
@@ -559,7 +560,7 @@ void EditStaff::applyPartProperties()
 
     if (m_instrument.id() != m_orgInstrument.id()) {
         masterNotationParts()->replaceInstrument(m_instrumentKey, m_instrument);
-    } else {
+    } else if (m_instrument != m_orgInstrument) {
         notationParts()->replaceInstrument(m_instrumentKey, m_instrument);
     }