Fix extending range selection to the left for the first time

Resolves: musescore#26720
cbjeukendrup · Feb 27, 2025 · 6aca98a · 6aca98a
1 parent 0de0784
commit 6aca98a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/src/engraving/dom/score.cpp b/src/engraving/dom/score.cpp
@@ -3647,10 +3647,10 @@ void Score::selectRange(EngravingItem* e, staff_idx_t staffIdx)
         if (startSegment) {
             Segment* endSegment = findElementEndSegment(this, e, m_selection.endSegment());
             staff_idx_t elementStaffIdx = e->staffIdx();
-            Fraction tick = startSegment->tick();
-            Fraction etick = endSegment->tick();
-
             if (endSegment && elementStaffIdx != muse::nidx) {
+                Fraction tick = startSegment->tick();
+                Fraction etick = endSegment->tick();
+
                 m_selection.extendRangeSelection(startSegment, endSegment, elementStaffIdx, tick, etick);
                 m_selection.updateSelectedElements();
 
@@ -3751,13 +3751,15 @@ bool Score::tryExtendSingleSelectionToRange(EngravingItem* newElement, staff_idx
     staff_idx_t endStaffIdx = startStaffIdx + 1;
 
     track_idx_t activeTrack = newElement->track();
+    bool activeSegmentIsStart = false;
 
     if (newElement->isMeasure()) {
         Measure* m = toMeasure(newElement);
         const Fraction tick = m->tick();
 
         if (tick < startSegment->tick()) {
             startSegment = m->first(SegmentType::ChordRest);
+            activeSegmentIsStart = true;
         }
         if (m == lastMeasure()) {
             endSegment = nullptr;
@@ -3773,6 +3775,7 @@ bool Score::tryExtendSingleSelectionToRange(EngravingItem* newElement, staff_idx
         Segment* newStartSegment = findElementStartSegment(this, newElement);
         if (newStartSegment && newStartSegment->tick() < startSegment->tick()) {
             startSegment = newStartSegment;
+            activeSegmentIsStart = true;
         }
 
         Segment* newEndSegment = findElementEndSegment(this, newElement, newStartSegment);
@@ -3791,6 +3794,7 @@ bool Score::tryExtendSingleSelectionToRange(EngravingItem* newElement, staff_idx
     m_selection.updateSelectedElements();
 
     m_selection.setActiveTrack(activeTrack);
+    m_selection.setActiveSegment(activeSegmentIsStart ? startSegment : endSegment);
 
     return true;
 }

diff --git a/src/engraving/dom/select.cpp b/src/engraving/dom/select.cpp
@@ -1545,7 +1545,7 @@ void Selection::extendRangeSelection(ChordRest* cr)
 
 void Selection::extendRangeSelection(Segment* seg, Segment* segAfter, staff_idx_t staffIdx, const Fraction& tick, const Fraction& etick)
 {
-    bool activeIsFirst = false;
+    bool activeSegmentIsStart = false;
     staff_idx_t activeStaff = m_activeTrack / VOICES;
 
     if (staffIdx < m_staffStart) {
@@ -1562,18 +1562,18 @@ void Selection::extendRangeSelection(Segment* seg, Segment* segAfter, staff_idx_
 
     if (tick < tickStart()) {
         m_startSegment = seg;
-        activeIsFirst = true;
+        activeSegmentIsStart = true;
     } else if (etick >= tickEnd()) {
         m_endSegment = segAfter;
     } else {
         if (m_activeSegment == m_startSegment) {
             m_startSegment = seg;
-            activeIsFirst = true;
+            activeSegmentIsStart = true;
         } else {
             m_endSegment = segAfter;
         }
     }
-    activeIsFirst ? m_activeSegment = m_startSegment : m_activeSegment = m_endSegment;
+    m_activeSegment = activeSegmentIsStart ? m_startSegment : m_endSegment;
     m_score->setSelectionChanged(true);
     assert(!(m_endSegment && !m_startSegment));
 }