fix search page function, make navigator aware of page offset

musescore · Apr 4, 2014 · 61409b1 · 61409b1
1 parent a152de6
commit 61409b1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/mscore/navigator.cpp b/mscore/navigator.cpp
@@ -325,7 +325,7 @@ void Navigator::paintEvent(QPaintEvent* ev)
             if (page->score()->layoutMode() == LayoutPage) {
                   p.setFont(QFont("FreeSans", 400));  // !!
                   p.setPen(MScore::layoutBreakColor);
-                  p.drawText(page->bbox(), Qt::AlignCenter, QString("%1").arg(page->no()+1));
+                  p.drawText(page->bbox(), Qt::AlignCenter, QString("%1").arg(page->no() + 1 + _score->pageNumberOffset()));
                   }
             p.translate(-pos);
             }

diff --git a/mscore/scoreview.cpp b/mscore/scoreview.cpp
@@ -5248,6 +5248,10 @@ void ScoreView::search(const QString& s)
 
 void ScoreView::searchPage(int n)
       {
+      n -= score()->pageNumberOffset();
+      if (n <= 0)
+            n = 1;
+      n--;
       if (n >= _score->npages())
             n = _score->npages() - 1;
       const Page* page = _score->pages()[n];