Fix "Same measure" for text lines

Backport of musescore#20137, part 2, see musescore#20137 (comment)
Jojo-Schmitz · Nov 25, 2023 · ba87541 · ba87541
1 parent 6a6c6b4
commit ba87541
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git a/libmscore/score.cpp b/libmscore/score.cpp
@@ -3315,6 +3315,8 @@ void Score::selectRange(Element* e, int staffIdx)
 void Score::collectMatch(void* data, Element* e)
       {
       ElementPattern* p = static_cast<ElementPattern*>(data);
+      auto eMeasure = e->findMeasure();
+
       if (p->type != int(e->type()))
             return;
 
@@ -3354,8 +3356,18 @@ void Score::collectMatch(void* data, Element* e)
                   return;
             }
 
-      if (p->measure && (p->measure != e->findMeasure()))
-            return;
+      if (p->measure) {
+            if (!eMeasure && e->isSpannerSegment()) {
+                  if (auto ss  = toSpannerSegment(e)) {
+                  if (auto s   = ss->spanner())       {
+                  if (auto se  = s->startElement())   {
+                  if (auto mse = se->findMeasure())   {
+                        eMeasure = mse;
+                        }}}}
+                  }
+            if (p->measure != eMeasure)
+                  return;
+            }
 
       if ((p->beat.isValid()) && (p->beat != e->beat()))
             return;

diff --git a/mscore/selectdialog.cpp b/mscore/selectdialog.cpp
@@ -108,8 +108,19 @@ void SelectDialog::setPattern(ElementPattern* p)
       else
             p->beat = Fraction(0,0);
 
-      if (sameMeasure->isChecked())
-            p->measure = e->findMeasure();
+      if (sameMeasure->isChecked()) {
+            auto m = e->findMeasure();
+            if (!m && e->isSpannerSegment()) {
+                  if (auto ss  = toSpannerSegment(e)) {
+                  if (auto s   = ss->spanner())       {
+                  if (auto se  = s->startElement())   {
+                  if (auto mse = se->findMeasure())   {
+                        m = mse;
+                        }}}}
+                  }
+            if (m)
+                  p->measure = m;
+            }
       else
             p->measure = nullptr;