Fix #201 - Allow selection rectangle to reach minimum note c-1 by adj…

…usting some clamping code
ryohey · May 22, 2024 · 1cf659a · 1cf659a
1 parent 2c5c79f
commit 1cf659a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/common/selection/Selection.ts b/src/common/selection/Selection.ts
@@ -53,14 +53,14 @@ export const regularizedSelection = (
     tick: Math.max(0, Math.min(fromTick, toTick)),
     noteNumber: Math.min(
       MaxNoteNumber,
-      Math.max(0, Math.max(fromNoteNumber, toNoteNumber)),
+      Math.max(fromNoteNumber, toNoteNumber),
     ),
   },
   to: {
     tick: Math.max(fromTick, toTick),
     noteNumber: Math.min(
       MaxNoteNumber,
-      Math.max(0, Math.min(fromNoteNumber, toNoteNumber)),
+      Math.min(fromNoteNumber, toNoteNumber),
     ),
   },
 })

diff --git a/src/main/actions/selection.ts b/src/main/actions/selection.ts
@@ -42,7 +42,7 @@ function eventsInSelection(events: TrackEvent[], selection: Selection) {
 export const resizeSelection =
   ({ pianoRollStore }: RootStore) =>
   (start: NotePoint, end: NotePoint) => {
-    const selection = regularizedSelection(
+    let selection = regularizedSelection(
       start.tick,
       start.noteNumber,
       end.tick,
@@ -53,7 +53,11 @@ export const resizeSelection =
     selection.from.noteNumber = Math.ceil(selection.from.noteNumber)
     selection.to.noteNumber = Math.floor(selection.to.noteNumber)
 
-    pianoRollStore.selection = clampSelection(selection)
+    ++selection.to.noteNumber;
+    selection = clampSelection(selection);
+    --selection.to.noteNumber;
+
+    pianoRollStore.selection = selection;
   }
 
 export const fixSelection =