26583: Percussion Pads context menu refinements

musescore · Feb 20, 2025 · 9bbf3cc · 9bbf3cc
1 parent af80582
commit 9bbf3cc
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 16 deletions.
diff --git a/src/notation/qml/MuseScore/NotationScene/internal/PercussionPanelPad.qml b/src/notation/qml/MuseScore/NotationScene/internal/PercussionPanelPad.qml
@@ -97,7 +97,7 @@ DropArea {
 
         onTriggered: {
             if (Boolean(root.padModel) && root.panelMode !== PanelMode.EDIT_LAYOUT) {
-                root.padModel.triggerPad()
+                root.padModel.triggerPad(ui.keyboardModifiers())
                 return
             }
             root.panelHasActiveKeyboardSwap ? root.endPadSwapRequested() : root.startPadSwapRequested(true)
@@ -197,7 +197,7 @@ DropArea {
                     Connections {
                         target: footerNavCtrl
                         function onTriggered() {
-                            padContent.openFooterContextMenu()
+                            padContent.openContextMenu(null)
                         }
                     }
                 }

diff --git a/src/notation/qml/MuseScore/NotationScene/internal/PercussionPanelPadContent.qml b/src/notation/qml/MuseScore/NotationScene/internal/PercussionPanelPadContent.qml
@@ -37,11 +37,16 @@ Column {
 
     property bool padSwapActive: false
 
-    function openFooterContextMenu() {
+    function openContextMenu(pos) {
         if (!root.padModel) {
             return
         }
-        menuLoader.toggleOpened(root.padModel.footerContextMenuItems)
+
+        if (!pos) {
+            pos = menuLoader.parent.mapFromItem(root, 0, root.height)
+        }
+
+        menuLoader.show(pos, root.padModel.contextMenuItems)
     }
 
     Item {
@@ -67,7 +72,8 @@ Column {
                 }
 
                 if (event.button === Qt.RightButton) {
-                    root.openFooterContextMenu()
+                    let pos = menuLoader.parent.mapFromItem(mouseArea, event.x, event.y)
+                    root.openContextMenu(pos)
                     return
                 }
 
@@ -177,8 +183,9 @@ Column {
 
             acceptedButtons: Qt.LeftButton | Qt.RightButton
 
-            onClicked: {
-                root.openFooterContextMenu()
+            onPressed: function(event) {
+                let pos = menuLoader.parent.mapFromItem(footerMouseArea, event.x, event.y)
+                root.openContextMenu(pos)
             }
         }
 
@@ -218,13 +225,13 @@ Column {
 
             text: Boolean(root.padModel) ? root.padModel.midiNote : ""
         }
+    }
 
-        StyledMenuLoader {
-            id: menuLoader
+    ContextMenuLoader {
+        id: menuLoader
 
-            onHandleMenuItem: function(itemId) {
-                root.padModel.handleMenuItem(itemId)
-            }
+        onHandleMenuItem: function(itemId) {
+            root.padModel.handleMenuItem(itemId)
         }
     }
 }
diff --git a/src/notation/view/percussionpanel/percussionpanelpadmodel.cpp b/src/notation/view/percussionpanel/percussionpanelpadmodel.cpp
@@ -81,7 +81,7 @@ const QVariant PercussionPanelPadModel::notationPreviewItemVariant() const
     return QVariant::fromValue(m_notationPreviewItem);
 }
 
-QList<QVariantMap> PercussionPanelPadModel::footerContextMenuItems() const
+QList<QVariantMap> PercussionPanelPadModel::contextMenuItems() const
 {
     static constexpr int definePadShortcutIcon = static_cast<int>(IconCode::Code::SHORTCUTS);
     // static constexpr int duplicatePadIcon = static_cast<int>(IconCode::Code::COPY);
@@ -95,7 +95,7 @@ QList<QVariantMap> PercussionPanelPadModel::footerContextMenuItems() const
         // { { "id", DUPLICATE_PAD_CODE }, { "title", muse::qtrc("global", "Duplicate") },
         //     { "icon", duplicatePadIcon }, { "enabled", true } },
 
-        { { "id", DELETE_PAD_CODE }, { "title", muse::qtrc("global", "Delete") },
+        { { "id", DELETE_PAD_CODE }, { "title", muse::qtrc("global", "Delete pad") },
             { "icon", deletePadIcon }, { "enabled", true } },
     };
 

diff --git a/src/notation/view/percussionpanel/percussionpanelpadmodel.h b/src/notation/view/percussionpanel/percussionpanelpadmodel.h
@@ -43,7 +43,7 @@ class PercussionPanelPadModel : public QObject, public muse::async::Asyncable
 
     Q_PROPERTY(QVariant notationPreviewItem READ notationPreviewItemVariant NOTIFY notationPreviewItemChanged)
 
-    Q_PROPERTY(QList<QVariantMap> footerContextMenuItems READ footerContextMenuItems CONSTANT)
+    Q_PROPERTY(QList<QVariantMap> contextMenuItems READ contextMenuItems CONSTANT)
 
 public:
     explicit PercussionPanelPadModel(QObject* parent = nullptr);
@@ -64,7 +64,7 @@ class PercussionPanelPadModel : public QObject, public muse::async::Asyncable
 
     const QVariant notationPreviewItemVariant() const;
 
-    QList<QVariantMap> footerContextMenuItems() const;
+    QList<QVariantMap> contextMenuItems() const;
     Q_INVOKABLE void handleMenuItem(const QString& itemId);
 
     Q_INVOKABLE void triggerPad(const Qt::KeyboardModifiers& modifiers);