Merge pull request #25886 from krasko78/23033-PartsDisplayedZoomedWhenTheNavigatorIsActive

23033: Parts are displayed at incorrect zoom level when the Navigator is open

Author: cbjeukendrup

src/notation/view/abstractnotationpaintview.cpp

@@ -230,8 +230,7 @@ void AbstractNotationPaintView::onCurrentNotationChanged()
 void AbstractNotationPaintView::onLoadNotation(INotationPtr)
 {
     if (viewport().isValid() && !m_notation->viewState()->isMatrixInited()) {
-        m_inputController->initZoom();
-        m_inputController->initCanvasPos();
+        initZoomAndPosition();
     }
 
     if (publishMode()) {
@@ -343,6 +342,10 @@ void AbstractNotationPaintView::onUnloadNotation(INotationPtr)
     }
 }
 
+void AbstractNotationPaintView::initZoomAndPosition()
+{
+}
+
 void AbstractNotationPaintView::setMatrix(const Transform& matrix)
 {
     if (m_matrix == matrix) {
@@ -391,8 +394,7 @@ void AbstractNotationPaintView::onViewSizeChanged()
 
     if (viewport().isValid()) {
         if (!notation()->viewState()->isMatrixInited()) {
-            m_inputController->initZoom();
-            m_inputController->initCanvasPos();
+            initZoomAndPosition();
         } else {
             m_inputController->updateZoomAfterSizeChange();
         }
@@ -424,6 +426,11 @@ void AbstractNotationPaintView::updateLoopMarkers()
     scheduleRedraw();
 }
 
+NotationViewInputController* AbstractNotationPaintView::inputController() const
+{
+    return m_inputController.get();
+}
+
 INotationPtr AbstractNotationPaintView::notation() const
 {
     return m_notation;

src/notation/view/abstractnotationpaintview.h

@@ -168,6 +168,9 @@ class AbstractNotationPaintView : public muse::uicomponents::QuickPaintedView, p
 protected:
     INotationPtr notation() const;
     void setNotation(INotationPtr notation);
+
+    NotationViewInputController* inputController() const;
+
     void setReadonly(bool readonly);
     void setMatrix(const muse::draw::Transform& matrix);
 
@@ -184,6 +187,8 @@ class AbstractNotationPaintView : public muse::uicomponents::QuickPaintedView, p
     virtual void onLoadNotation(INotationPtr notation);
     virtual void onUnloadNotation(INotationPtr notation);
 
+    virtual void initZoomAndPosition();
+
     virtual void onMatrixChanged(const muse::draw::Transform& oldMatrix, const muse::draw::Transform& newMatrix, bool overrideZoomType);
 
 protected slots:

src/notation/view/notationpaintview.cpp

@@ -54,6 +54,14 @@ void NotationPaintView::onUnloadNotation(INotationPtr notation)
     notation->viewState()->matrixChanged().resetOnReceive(this);
 }
 
+void NotationPaintView::initZoomAndPosition()
+{
+    if (notation() && !notation()->viewState()->isMatrixInited()) {
+        inputController()->initZoom();
+        inputController()->initCanvasPos();
+    }
+}
+
 void NotationPaintView::onMatrixChanged(const Transform& oldMatrix, const Transform& newMatrix, bool overrideZoomType)
 {
     AbstractNotationPaintView::onMatrixChanged(oldMatrix, newMatrix, overrideZoomType);

src/notation/view/notationpaintview.h

@@ -34,6 +34,8 @@ class NotationPaintView : public AbstractNotationPaintView
     void onLoadNotation(INotationPtr notation) override;
     void onUnloadNotation(INotationPtr notation) override;
 
+    void initZoomAndPosition() override;
+
     void onMatrixChanged(const muse::draw::Transform& oldMatrix, const muse::draw::Transform& newMatrix,
                          bool overrideZoomType = true) override;