Fixed internals of abstract popups - uses enum not int

Author: miiizen

src/notation/qml/MuseScore/NotationScene/NotationView.qml

@@ -137,8 +137,8 @@ FocusScope {
                         contextMenuLoader.close()
                     }
 
-                    onShowElementPopupRequested: function (elementType, viewPos, elemSize) {
-                        popUpLoader.show(elementType, viewPos, elemSize)
+                    onShowElementPopupRequested: function (popupType, viewPos, elemSize) {
+                        popUpLoader.show(popupType, viewPos, elemSize)
                     }
 
                     onHideElementPopupRequested: {

src/notation/qml/MuseScore/NotationScene/internal/ElementPopupLoader.qml

@@ -35,7 +35,6 @@ Item {
 
     anchors.fill: parent
 
-    property int type: -1
     property var openedPopup: null
     property bool isPopupOpened: Boolean(openedPopup) && openedPopup.isOpened
 
@@ -45,13 +44,9 @@ Item {
     QtObject {
         id: prv
 
-        function setPopupType(elementType) {
-            type = elementType
-        }
-
         function componentByType(type) {
             switch (type) {
-            case 52: return harpPedalComp
+            case Notation.TYPE_HARP_DIAGRAM: return harpPedalComp
             }
 
             return null
@@ -84,8 +79,7 @@ Item {
             return
         }
 
-        prv.setPopupType(elementType)
-        var popup = loader.createPopup(prv.componentByType(type), viewPos, size)
+        var popup = loader.createPopup(prv.componentByType(elementType), viewPos, size)
         prv.openPopup(popup)
     }
 

src/notation/view/abstractnotationpaintview.cpp

@@ -489,8 +489,9 @@ void AbstractNotationPaintView::showElementPopup(const ElementType& elementType,
 
     RectF elemRect = fromLogical(size);
     QPointF elemSize = QPointF(elemRect.width(), elemRect.height());
+    PopupModelType modelType = AbstractElementPopupModel::modelTypeFromElement(elementType);
 
-    emit showElementPopupRequested(static_cast<int>(elementType), pos, elemSize);
+    emit showElementPopupRequested(modelType, pos, elemSize);
 
     if (activateFocus) {
         dispatcher()->dispatch("nav-first-control");

src/notation/view/abstractnotationpaintview.h

@@ -45,6 +45,7 @@
 #include "playbackcursor.h"
 #include "loopmarker.h"
 #include "continuouspanel.h"
+#include "internal/abstractelementpopupmodel.h"
 
 namespace mu::notation {
 class AbstractNotationPaintView : public uicomponents::QuickPaintedView, public IControlledView, public async::Asyncable,
@@ -140,7 +141,7 @@ class AbstractNotationPaintView : public uicomponents::QuickPaintedView, public
     void showContextMenuRequested(int elementType, const QPointF& viewPos);
     void hideContextMenuRequested();
 
-    void showElementPopupRequested(int elementType, const QPointF& viewPos, const QPointF& elemSize);
+    void showElementPopupRequested(mu::notation::PopupModelType modelType, const QPointF& viewPos, const QPointF& elemSize);
     void hideElementPopupRequested();
 
     void horizontalScrollChanged();

src/notation/view/internal/abstractelementpopupmodel.h

@@ -36,7 +36,7 @@ class AbstractElementPopupModel : public QObject, public async::Asyncable
 
 public slots:
     void setTitle(QString title);
-    void setModelType(mu::notation::AbstractElementPopupModel::PopupModelType modelType);
+    void setModelType(PopupModelType modelType);
 
 signals:
     void titleChanged();
@@ -66,4 +66,8 @@ public slots:
 using PopupModelType = AbstractElementPopupModel::PopupModelType;
 } //namespace mu::notation
 
+#ifndef NO_QT_SUPPORT
+Q_DECLARE_METATYPE(mu::notation::PopupModelType)
+#endif
+
 #endif // MU_NOTATION_ABSTRACTELEMENTPOPUPMODEL_H