fix #302822: breaks are now accessible via keyboard

musescore · Apr 9, 2020 · b140feb · b140feb
1 parent dcb744c
commit b140feb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/libmscore/navigate.cpp b/libmscore/navigate.cpp
@@ -641,6 +641,9 @@ Element* Score::nextElement()
                               return mb;
                               }
                         }
+                  case ElementType::LAYOUT_BREAK: {
+                        staffId = 0; // otherwise it will equal -1, which breaks the navigation
+                        }
                   default:
                         break;
                   }
@@ -776,6 +779,9 @@ Element* Score::prevElement()
                               return mb;
                               }
                         }
+                  case ElementType::LAYOUT_BREAK: {
+                        staffId = 0; // otherwise it will equal -1, which breaks the navigation
+                        }
                   default:
                         break;
                   }

diff --git a/libmscore/segment.cpp b/libmscore/segment.cpp
@@ -1626,6 +1626,8 @@ Element* Segment::nextElement(int activeStaff)
                               return nmb;
                         else if (nme && nme->isTextBase() && nme->staffIdx() == e->staffIdx())
                               return nme;
+                        else if (nme && nme->isLayoutBreak() && e->staffIdx() == 0)
+                              return nme;
                         }
 
                   while (nextSegment) {
@@ -1769,6 +1771,8 @@ Element* Segment::prevElement(int activeStaff)
                          Element* me = measure()->el().empty() ? nullptr : measure()->el().back();
                          if (me && me->isTextBase() && me->staffIdx() == e->staffIdx())
                                return me;
+                         else if (me && me->isLayoutBreak() && e->staffIdx() == 0)
+                               return me;
                          else if (psm != pmb)
                               return pmb;
                          }