NotationNavigator: decouple cursor from rest of navigator

This avoids having to redraw the whole navigator when only the
cursor is moved, improving performance on large scores.

Resolves musescore#10201 (partially)

src/notation/view/notationnavigator.cpp

@@ -21,14 +21,49 @@
  */
 #include "notationnavigator.h"
 
+#include "draw/types/geometry.h"
 #include "engraving/dom/system.h"
 
 #include "log.h"
+#include <memory>
+#include <qevent.h>
+#include <qpainter.h>
+#include <qquickitem.h>
+#include <qquickpainteditem.h>
+#include <qwidget.h>
 
 using namespace mu::notation;
 
+NotationNavigatorViewRect::NotationNavigatorViewRect(QQuickItem* parent)
+    : QQuickPaintedItem(parent)
+{
+    this->setSize(parent->size()); // FIXME: doesn't set the size
+}
+
+void NotationNavigatorViewRect::paint(QPainter* painter)
+{
+    TRACEFUNC;
+
+    QColor color(configuration()->selectionColor());
+    QPen pen(color, configuration()->borderWidth());
+    painter->setPen(pen);
+    painter->setBrush(QColor(color.red(), color.green(), color.blue(), configuration()->cursorOpacity()));
+
+    painter->drawRect(m_cursorRect.toQRectF());
+}
+
+mu::RectF NotationNavigatorViewRect::getRect()
+{
+    return m_cursorRect;
+}
+
+void NotationNavigatorViewRect::setRect(RectF cursorRect)
+{
+    m_cursorRect = cursorRect;
+}
+
 NotationNavigator::NotationNavigator(QQuickItem* parent)
-    : AbstractNotationPaintView(parent)
+    : AbstractNotationPaintView(parent), m_viewRect(std::make_unique<NotationNavigatorViewRect>(this))
 {
     setReadonly(true);
 }
@@ -42,6 +77,7 @@ void NotationNavigator::load()
 
     uiConfiguration()->currentThemeChanged().onNotify(this, [this]() {
         update();
+        m_viewRect->update();
     });
 
     AbstractNotationPaintView::load();
@@ -103,14 +139,15 @@ void NotationNavigator::mousePressEvent(QMouseEvent* event)
 {
     TRACEFUNC;
 
+    RectF cursorRect = m_viewRect->getRect();
     PointF logicPos = toLogical(event->pos());
     m_startMove = logicPos;
-    if (m_cursorRect.contains(logicPos)) {
+    if (cursorRect.contains(logicPos)) {
         return;
     }
 
-    double dx = logicPos.x() - (m_cursorRect.x() + (m_cursorRect.width() / 2));
-    double dy = logicPos.y() - (m_cursorRect.y() + (m_cursorRect.height() / 2));
+    double dx = logicPos.x() - (cursorRect.x() + (cursorRect.width() / 2));
+    double dy = logicPos.y() - (cursorRect.y() + (cursorRect.height() / 2));
 
     moveNotationRequested(-dx, -dy);
 }
@@ -126,7 +163,7 @@ void NotationNavigator::mouseMoveEvent(QMouseEvent* event)
     m_startMove = logicPos;
 }
 
-void NotationNavigator::moveCanvasToRect(const RectF& viewRect)
+bool NotationNavigator::moveCanvasToRect(const RectF& viewRect)
 {
     TRACEFUNC;
 
@@ -144,7 +181,7 @@ void NotationNavigator::moveCanvasToRect(const RectF& viewRect)
         PointF bottom = newViewRect.bottomRight();
 
         if (!notationContentRect.contains(top) && !notationContentRect.contains(bottom)) {
-            return;
+            return false;
         }
 
         if (viewport.top() > top.y()) {
@@ -159,7 +196,7 @@ void NotationNavigator::moveCanvasToRect(const RectF& viewRect)
         PointF right = newViewRect.bottomRight();
 
         if (!notationContentRect.contains(left) && !notationContentRect.contains(right)) {
-            return;
+            return false;
         }
 
         if (viewport.left() > left.x()) {
@@ -169,7 +206,7 @@ void NotationNavigator::moveCanvasToRect(const RectF& viewRect)
         }
     }
 
-    moveCanvas(-dx, -dy);
+    return moveCanvas(-dx, -dy);
 }
 
 void NotationNavigator::setCursorRect(const QRectF& rect)
@@ -182,11 +219,15 @@ void NotationNavigator::setCursorRect(const QRectF& rect)
 
     RectF newCursorRect = notationContentRect().intersected(RectF::fromQRectF(rect));
 
-    moveCanvasToRect(newCursorRect);
+    bool moved = moveCanvasToRect(newCursorRect);
+
+    m_viewRect->setRect(newCursorRect);
 
-    m_cursorRect = newCursorRect;
     rescale();
-    update();
+    if (moved) {
+        update();
+    }
+    m_viewRect->update();
 }
 
 int NotationNavigator::orientation() const
@@ -238,25 +279,12 @@ void NotationNavigator::paint(QPainter* painter)
     AbstractNotationPaintView::paint(painter);
 
     paintPageNumbers(painter);
-    paintCursor(painter);
 }
 
 void NotationNavigator::onViewSizeChanged()
 {
 }
 
-void NotationNavigator::paintCursor(QPainter* painter)
-{
-    TRACEFUNC;
-
-    QColor color(configuration()->selectionColor());
-    QPen pen(color, configuration()->borderWidth());
-    painter->setPen(pen);
-    painter->setBrush(QColor(color.red(), color.green(), color.blue(), configuration()->cursorOpacity()));
-
-    painter->drawRect(m_cursorRect.toQRectF());
-}
-
 void NotationNavigator::paintPageNumbers(QPainter* painter)
 {
     if (notationViewMode() != ViewMode::PAGE) {

src/notation/view/notationnavigator.h

@@ -26,7 +26,12 @@
 #include <QMouseEvent>
 #include <QPainter>
 #include <QQuickPaintedItem>
+#include <memory>
+#include <qpainter.h>
+#include <qquickpainteditem.h>
+#include <qwidget.h>
 
+#include "draw/types/geometry.h"
 #include "modularity/ioc.h"
 #include "async/asyncable.h"
 #include "inotationconfiguration.h"
@@ -36,6 +41,22 @@
 #include "abstractnotationpaintview.h"
 
 namespace mu::notation {
+class NotationNavigatorViewRect : public QQuickPaintedItem
+{
+    Q_OBJECT
+
+    INJECT(INotationConfiguration, configuration)
+
+    virtual void paint(QPainter* painter) override;
+    RectF m_cursorRect;
+
+public:
+    NotationNavigatorViewRect(QQuickItem* parent = nullptr);
+
+    RectF getRect();
+    void setRect(RectF cursorRect);
+};
+
 class NotationNavigator : public AbstractNotationPaintView
 {
     Q_OBJECT
@@ -76,16 +97,15 @@ class NotationNavigator : public AbstractNotationPaintView
     void mousePressEvent(QMouseEvent* event) override;
     void mouseMoveEvent(QMouseEvent* event) override;
 
-    void paintCursor(QPainter* painter);
     void paintPageNumbers(QPainter* painter);
 
-    void moveCanvasToRect(const RectF& viewRect);
+    bool moveCanvasToRect(const RectF& viewRect);
 
     bool isVerticalOrientation() const;
 
     PageList pages() const;
 
-    RectF m_cursorRect;
+    std::unique_ptr<NotationNavigatorViewRect> m_viewRect;
     PointF m_startMove;
 };
 }