Merge pull request #1197 from oxygen-dioxide/splitnote

Fix very long note produced by knife tool
stakira · Jul 22, 2024 · 3b943c9 · 3b943c9
2 parents 93a3953 + 7dd766e
commit 3b943c9
Showing 1 changed file with 17 additions and 2 deletions.
diff --git a/OpenUtau/Views/NoteEditStates.cs b/OpenUtau/Views/NoteEditStates.cs
@@ -400,11 +400,20 @@ public NoteSplitEditState(
         public override void Begin(IPointer pointer, Point point) {
             var notesVm = vm.NotesViewModel;
             base.Begin(pointer, point);
+            var project = DocManager.Inst.Project;
             var part = notesVm.Part;
+            if (project == null || part == null || note == null) {
+                return;
+            }
+            int snapUnit = project.resolution * 4 / notesVm.SnapDiv;
+            if (note.duration <= snapUnit) {
+                return;
+            }
             newNote = notesVm.MaybeAddNote(point, false);
-            if (part == null || newNote == null) {
+            if (newNote == null) {
                 return;
             }
+
             DocManager.Inst.ExecuteCmd(new ChangeNoteLyricCommand(part, newNote, "+"));
         }
 
@@ -426,7 +435,13 @@ public override void Update(IPointer pointer, Point point) {
             if (notesVm.IsSnapOn && snapUnit > 0) {
                 maxNegDelta = (int)Math.Floor((double)maxNegDelta / snapUnit) * snapUnit;
             }
-            deltaDuration = Math.Max(deltaDuration, -maxNegDelta);
+
+            int maxNoteTicks = (notesVm.IsSnapOn && snapUnit > 0) 
+                ? (oldDur-1) / snapUnit * snapUnit 
+                : oldDur - 15;
+            int maxDelta = maxNoteTicks - note.duration;
+
+            deltaDuration = Math.Clamp(deltaDuration, -maxNegDelta, maxDelta);
 
             if (deltaDuration == 0) {
                 valueTip.UpdateValueTip(note.duration.ToString());