Merge pull request #3884 from DDMAL/c4-fix

refactor: `Drag`, `AdjustPitchFromPosition`, add `AdjustPitchAfterDrag`
rism-digital · Dec 16, 2024 · b9accc4 · b9accc4
2 parents 5851c10 + 3c32804
commit b9accc4
Show file tree

Hide file tree

Showing 2 changed files with 159 additions and 222 deletions.
diff --git a/include/vrv/editortoolkit_neume.h b/include/vrv/editortoolkit_neume.h
@@ -41,7 +41,7 @@ class EditorToolkitNeume : public EditorToolkit {
     ///@{
     bool Chain(jsonxx::Array actions);
     bool DisplaceClefOctave(std::string elementId, std::string direction);
-    bool Drag(std::string elementId, int x, int y);
+    bool Drag(std::string elementId, int x, int y, bool topLevel = true);
     bool Insert(std::string elementType, std::string staffId, int ulx, int uly, int lrx, int lry,
         std::vector<std::pair<std::string, std::string>> attributes);
     bool InsertToSyllable(std::string elementId);
@@ -102,7 +102,8 @@ class EditorToolkitNeume : public EditorToolkit {
      * Helper functions for editor actions.
      */
     ///@{
-    bool AdjustPitchFromPosition(Object *obj, Clef *clef = NULL);
+    bool AdjustPitchAfterDrag(Object *obj, int y = 0);
+    bool AdjustPitchFromPosition(Object *obj);
     bool AdjustClefLineFromPosition(Clef *clef, Staff *staff = NULL);
     ///@}
 };