Merge pull request #26498 from mathesoncalum/percussion_refinements_7

Author: cbjeukendrup

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

@@ -57,14 +57,21 @@ Column {
             enabled: mainContentArea.enabled
             hoverEnabled: true
 
-            onPressed: {
+            acceptedButtons: Qt.LeftButton | Qt.RightButton
+
+            onPressed: function(event) {
                 ui.tooltip.hide(root)
 
                 if (!Boolean(root.padModel)) {
                     return
                 }
 
-                root.padModel.triggerPad()
+                if (event.button === Qt.RightButton) {
+                    root.openFooterContextMenu()
+                    return
+                }
+
+                root.padModel.triggerPad(event.modifiers)
             }
 
             onContainsMouseChanged: {
@@ -168,6 +175,8 @@ Column {
             anchors.fill: parent
             enabled: root.panelMode !== PanelMode.EDIT_LAYOUT
 
+            acceptedButtons: Qt.LeftButton | Qt.RightButton
+
             onClicked: {
                 root.openFooterContextMenu()
             }

src/notation/view/percussionpanel/percussionpanelmodel.cpp

@@ -39,9 +39,16 @@ static const QString EDIT_LAYOUT_CODE("percussion-edit-layout");
 static const QString RESET_LAYOUT_CODE("percussion-reset-layout");
 
 using namespace muse;
-using namespace ui;
+using namespace muse::actions;
+using namespace muse::ui;
 using namespace mu::notation;
 
+static const std::unordered_map<PercussionPanelPadModel::PadAction, NoteAddingMode> WRITE_ACTION_MAP = {
+    { PercussionPanelPadModel::PadAction::TRIGGER_STANDARD, NoteAddingMode::NextChord },
+    { PercussionPanelPadModel::PadAction::TRIGGER_ADD, NoteAddingMode::CurrentChord },
+    { PercussionPanelPadModel::PadAction::TRIGGER_INSERT, NoteAddingMode::InsertChord }
+};
+
 PercussionPanelModel::PercussionPanelModel(QObject* parent)
     : QObject(parent)
 {
@@ -278,8 +285,10 @@ void PercussionPanelModel::setUpConnections()
 
     m_padListModel->padActionRequested().onReceive(this, [this](PercussionPanelPadModel::PadAction action, int pitch) {
         switch (action) {
-        case PercussionPanelPadModel::PadAction::TRIGGER:
-            onPadTriggered(pitch);
+        case PercussionPanelPadModel::PadAction::TRIGGER_STANDARD:
+        case PercussionPanelPadModel::PadAction::TRIGGER_ADD:
+        case PercussionPanelPadModel::PadAction::TRIGGER_INSERT:
+            onPadTriggered(pitch, action);
             break;
         case PercussionPanelPadModel::PadAction::DUPLICATE:
             onDuplicatePadRequested(pitch);
@@ -361,12 +370,15 @@ bool PercussionPanelModel::eventFilter(QObject* watched, QEvent* event)
     return true;
 }
 
-void PercussionPanelModel::onPadTriggered(int pitch)
+void PercussionPanelModel::onPadTriggered(int pitch, const PercussionPanelPadModel::PadAction& action)
 {
     switch (currentPanelMode()) {
-    case PanelMode::Mode::EDIT_LAYOUT: return;
-    case PanelMode::Mode::WRITE: writePitch(pitch); // fall through
-    case PanelMode::Mode::SOUND_PREVIEW: playPitch(pitch);
+    case PanelMode::Mode::WRITE:
+        writePitch(pitch, WRITE_ACTION_MAP.at(action));
+        break;
+    case PanelMode::Mode::SOUND_PREVIEW:
+        playPitch(pitch);
+        break;
     default: break;
     }
 }
@@ -445,24 +457,20 @@ void PercussionPanelModel::onDefinePadShortcutRequested(int pitch)
     undoStack->commitChanges();
 }
 
-void PercussionPanelModel::writePitch(int pitch)
+void PercussionPanelModel::writePitch(int pitch, const NoteAddingMode& addingMode)
 {
     INotationUndoStackPtr undoStack = notation()->undoStack();
     if (!interaction() || !undoStack) {
         return;
     }
 
-    undoStack->prepareChanges(muse::TranslatableString("undoableAction", "Enter percussion note"));
-
     interaction()->noteInput()->startNoteInput(configuration()->defaultNoteInputMethod(), /*focusNotation*/ false);
 
-    score()->addMidiPitch(pitch, false, /*transpose*/ false);
-    undoStack->commitChanges();
+    NoteInputParams params;
+    params.drumPitch = pitch;
 
-    const mu::engraving::InputState& inputState = score()->inputState();
-    if (inputState.cr()) {
-        interaction()->showItem(inputState.cr());
-    }
+    const ActionData args = ActionData::make_arg2<NoteInputParams, NoteAddingMode>(params, addingMode);
+    dispatcher()->dispatch("note-action", args);
 }
 
 void PercussionPanelModel::playPitch(int pitch)

src/notation/view/percussionpanel/percussionpanelmodel.h

@@ -119,12 +119,12 @@ class PercussionPanelModel : public QObject, public muse::Injectable, public mus
 
     bool eventFilter(QObject* watched, QEvent* event) override;
 
-    void onPadTriggered(int pitch);
+    void onPadTriggered(int pitch, const PercussionPanelPadModel::PadAction& action);
     void onDuplicatePadRequested(int pitch);
     void onDeletePadRequested(int pitch);
     void onDefinePadShortcutRequested(int pitch);
 
-    void writePitch(int pitch);
+    void writePitch(int pitch, const NoteAddingMode& addingMode);
     void playPitch(int pitch);
 
     void resetLayout();

src/notation/view/percussionpanel/percussionpanelpadmodel.cpp

@@ -83,22 +83,20 @@ const QVariant PercussionPanelPadModel::notationPreviewItemVariant() const
 
 QList<QVariantMap> PercussionPanelPadModel::footerContextMenuItems() const
 {
+    static constexpr int definePadShortcutIcon = static_cast<int>(IconCode::Code::SHORTCUTS);
     // static constexpr int duplicatePadIcon = static_cast<int>(IconCode::Code::COPY);
     static constexpr int deletePadIcon = static_cast<int>(IconCode::Code::DELETE_TANK);
-    static constexpr int definePadShortcutIcon = static_cast<int>(IconCode::Code::SHORTCUTS);
 
     QList<QVariantMap> menuItems = {
+        { { "id", DEFINE_PAD_SHORTCUT_CODE }, { "title", muse::qtrc("shortcuts", "Define keyboard shortcut") },
+            { "icon", definePadShortcutIcon }, { "enabled", true } },
+
         //! NOTE: Disabled for now - will be re-introduced with new percussion mapping system...
         // { { "id", DUPLICATE_PAD_CODE }, { "title", muse::qtrc("global", "Duplicate") },
         //     { "icon", duplicatePadIcon }, { "enabled", true } },
 
         { { "id", DELETE_PAD_CODE }, { "title", muse::qtrc("global", "Delete") },
             { "icon", deletePadIcon }, { "enabled", true } },
-
-        { }, // separator
-
-        { { "id", DEFINE_PAD_SHORTCUT_CODE }, { "title", muse::qtrc("shortcuts", "Define keyboard shortcut") },
-            { "icon", definePadShortcutIcon }, { "enabled", true } },
     };
 
     return menuItems;
@@ -115,7 +113,15 @@ void PercussionPanelPadModel::handleMenuItem(const QString& itemId)
     }
 }
 
-void PercussionPanelPadModel::triggerPad()
+void PercussionPanelPadModel::triggerPad(const Qt::KeyboardModifiers& mods)
 {
-    m_padActionTriggered.send(PadAction::TRIGGER);
+    PadAction action = PadAction::TRIGGER_STANDARD;
+
+    if (mods & Qt::ShiftModifier && (mods & Qt::ControlModifier || mods & Qt::MetaModifier)) {
+        action = PadAction::TRIGGER_INSERT;
+    } else if (mods & Qt::ShiftModifier) {
+        action = PadAction::TRIGGER_ADD;
+    }
+
+    m_padActionTriggered.send(action);
 }

src/notation/view/percussionpanel/percussionpanelpadmodel.h

@@ -67,10 +67,12 @@ class PercussionPanelPadModel : public QObject, public muse::async::Asyncable
     QList<QVariantMap> footerContextMenuItems() const;
     Q_INVOKABLE void handleMenuItem(const QString& itemId);
 
-    Q_INVOKABLE void triggerPad();
+    Q_INVOKABLE void triggerPad(const Qt::KeyboardModifiers& modifiers);
 
     enum class PadAction {
-        TRIGGER,
+        TRIGGER_STANDARD,
+        TRIGGER_ADD,
+        TRIGGER_INSERT,
         DUPLICATE,
         DELETE,
         DEFINE_SHORTCUT,